Mario Danic 0ffb67c506 Merge branch 'branding' into bring-branding-to-master ... # Conflicts: # .drone.yml # build.gradle # src/main/java/com/owncloud/android/services/SyncedFolderJobService.java # src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java # src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java		2017-03-05 21:09:36 +01:00
..
xml	Merge branch 'branding' into bring-branding-to-master	2017-03-05 21:09:36 +01:00