## 2017-09-28 00:32
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-27 00:32
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-26 00:32
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-25 00:32
New branches:
/

Updated branches:

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-24 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-23 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-22 00:33
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-21 00:32
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-20 00:33
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-19 00:38
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-18 08:25
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-18 00:35
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-17 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-16 00:32
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-15 00:33
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-14 00:33
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-13 00:33
New branches:
/

Updated branches:

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-12 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-09-11 00:31
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-10 00:32
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-09 00:32
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] conflicting
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-08 00:32
New branches:
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] added
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] added
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] added

Updated branches:
-Dev branch was updated successfully] updated
- Lint: fix Obsolete SDK_INT Version Check (nextcloud/fixLegacySDKUse) [https://github.com/nextcloud/android/pull/1507] updated
- Codacy: remove unused code (nextcloud/removeUnusedCode) [https://github.com/nextcloud/android/pull/1497] updated
- Update libs to latest versions to satisfy lint (nextcloud/fixLibVersionLintWarnings) [https://github.com/nextcloud/android/pull/1459] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Lint: fix UnknownIdInLayout: use correct reference to an id that is in the current layout (nextcloud/fixLayoutIds) [https://github.com/nextcloud/android/pull/1506] conflicting
- Lint: Add Plural strings (nextcloud/pluralStrings) [https://github.com/nextcloud/android/pull/1503] conflicting
- Codacy: fix further issues (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-07 00:31
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-06 00:31
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-05 00:32
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-04 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-03 00:31
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-09-01 00:31
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-08-31 00:31
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-08-30 00:31
New branches:
/

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-08-29 00:31
New branches:
/

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-08-28 00:30
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-27 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-26 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-25 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-24 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-23 00:31
New branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] added

Updated branches:
- Master (nextcloud/master) [https://github.com/nextcloud/android] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-08-22 00:33
New branches:
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] added

Updated branches:
-Dev branch was updated successfully] updated
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting

## 2017-08-21 00:31
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-20 00:33
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-19 00:32
New branches:
/

Updated branches:

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Comment out adding all new downloaded files to folder observer (nextcloud/folderObserver) [https://github.com/nextcloud/android/pull/1155] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting
- Resized images (nextcloud/resizedImages) [https://github.com/nextcloud/android/pull/69] conflicting
- Master (nextcloud/master) [https://github.com/nextcloud/android] conflicting

## 2017-08-18 00:31
New branches:
-Dev branch was updated successfully] added

Updated branches:
-Dev branch was updated successfully] updated

Conflicting branches:
- Handle foreign broadcast (nextcloud/handleForeignBroadcast) [https://github.com/nextcloud/android/pull/1362] conflicting
- Fix rare case: ssl cert is ok for checkServer, but not for webview (nextcloud/untrustedCerts) [https://github.com/nextcloud/android/pull/1361] conflicting
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] conflicting

## 2017-08-17 11:17
New branches:
- Fix rare case: ssl cert is ok for checkServer, but not for webview (nextcloud/untrustedCerts) [https://github.com/nextcloud/android/pull/1361] added

Updated branches:
- Fix rare case: ssl cert is ok for checkServer, but not for webview (nextcloud/untrustedCerts) [https://github.com/nextcloud/android/pull/1361] updated

Conflicting branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] conflicting
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting

## 2017-08-17 00:31
New branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] added

Updated branches:
- Further Codacy fixes (nextcloud/codacyFixes) [https://github.com/nextcloud/android/pull/1357] updated
- Check if columns exists prior adding them (nextcloud/errorDuringDbUpgrade) [https://github.com/nextcloud/android/pull/1342] updated

Conflicting branches:
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting

## 2017-08-16 14:36
New branches:
- Check if columns exists prior adding them (nextcloud/errorDuringDbUpgrade) [https://github.com/nextcloud/android/pull/1342] added
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] added
- Dev base (nextcloud/dev-base) [https://github.com/nextcloud/android/tree/dev-base] added

Updated branches:
- Check if columns exists prior adding them (nextcloud/errorDuringDbUpgrade) [https://github.com/nextcloud/android/pull/1342] updated
- Search inside of text files (nextcloud/bugfix-454) [https://github.com/nextcloud/android/pull/565] updated
- Dev base (nextcloud/dev-base) [https://github.com/nextcloud/android/tree/dev-base] updated

Conflicting branches:
- Error feedback improvement (nextcloud/errorFeedback) [https://github.com/nextcloud/android/pull/1198] conflicting

## 2017-08-16 08:48
New branches:
/

Updated branches:

Conflicting branches:
/

## 1.4.3 (May 22, 2017)
- Hotfix: ignore oauth header for now and use basic auth to allow new logins for Nc12

## 1.4.2 (March 14, 2017)
- Auto Upload for newly taken photos/images (Android 6+)
- Auto Upload improvements and fixes
- Filtering improvements
- Fix for Android permissions (removed read phone state permission)
- Fix re-upload of files
- Avoid toggling favourite for all selected files
- Link to providers list in the setup screen
- Further bug fixes and improvements

## 1.4.1 (January 27, 2017)
- Share URLs to Nextcloud
- Improve performance of Auto Upload view
- Fix for removing files
- Proper email sharee handling
- Navigation drawer: Fix lag on older devices
- Android 7: Pending jobs in upload view
- Android 7: Auto upload: ignore ".tmp" files and folders
- Bug fixes and design improvements

## 1.4.0 (December 8, 2016)

- External SD card support
- Auto Upload (Android 7+)
- What's new start screen
- Show/hide hidden folders & files
- Upload view: switch between grid/list view
- Descend into folder after creating it in uploader
- Provisioning links to launch and prefill app with login data
- Add open URL file feature
- Sort favorite files first in list
- Account switcher optimizations
- Bugfixes and design improvements
- Update library to 1.0.9

## 1.3.1 (September 20, 2016)

- Move action hard to discover - difference between single/multi selection
- Show move/copy context in toolbar title
- Share file with dictadroid to Nextcloud
- Don't show upload failure notification for already deleted files

## 1.3.0 (September 17, 2016)

- Files drop permission in share viewe
- Display quota if configured/available in navigation drawer
- Resume chunked uploads instead of complete restarts
- Filter remote and local file lists
- Simple integration with DAVdroid for calendar and contacts sync
- Mix folders and files on sort by date
- Upload when charging option
- Revamp upload options Move/Copy/Just-Upload
- Text can be selected and shared to Nextcloud
- Respect metered wifi and block instant uploads
- Proper handling of .djvu files
- Bugfixes and design improvements

## 1.2.0 (July 29, 2016)

- Multi select capabilities
- Confirmation dialog on account removal
- Offline available filter in main menu
- Sorting capability when choosing files to be uploaded
- Video thumbnails if activated on server
- Thumbnails during upload
- Fixed user agent for file firewalling
- Showing server side folder sizes
- Text in test preview can now be selected
- Search suggestions fixed for user/group search during sharing
- Minor bugfixes

## 1.1.0 (July 6, 2016)

- New main menu to switch accounts easily
- Ability to open Nextcloud hosted files (read-only) from other apps that support the standard file chooser (requires Android 4.4 / KitKat or higher)
- "Select all files" for upload within a folder
- Optional feature to auto-create monthly folders for your instant uploads
- Revamped login screen
- Minor bugfixes

## 1.0.1 (June 20, 2016)

- Fix thumbnail preview support for new files
- Add support for animated GIFs
- Optimized uploader layout

## 1.0.0 (June 12, 2016)

- Initial release of the Nextcloud Android app
