316 commits

Author	SHA1	Message	Date
Nextcloud bot	fb4374d9fc	[tx-robot] updated from transifex	2017-04-20 00:21:12 +00:00
Nextcloud bot	c05abb6952	[tx-robot] updated from transifex	2017-04-07 00:22:55 +00:00
Nextcloud bot	5b6ecabae8	[tx-robot] updated from transifex	2017-04-06 00:21:41 +00:00
Nextcloud bot	7e4b3fb858	[tx-robot] updated from transifex	2017-04-03 00:21:37 +00:00
Nextcloud bot	9f2a8158f6	[tx-robot] updated from transifex	2017-03-31 00:21:57 +00:00
Nextcloud bot	cb753fd332	[tx-robot] updated from transifex	2017-03-29 00:20:33 +00:00
Nextcloud bot	a92e7e31aa	[tx-robot] updated from transifex	2017-03-28 00:20:53 +00:00
Nextcloud bot	87b930f251	[tx-robot] updated from transifex	2017-03-27 00:20:55 +00:00
Nextcloud bot	321d316d4b	[tx-robot] updated from transifex	2017-03-26 04:08:59 +00:00
AndyScherzinger	4077980ea0	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-16 23:09:58 +01:00
AndyScherzinger	2fbc7d05cf	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-14 21:56:31 +01:00
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
Mario Danic	72349b5ef9	Merge branch 'master' into branding	2017-03-02 12:46:00 +01:00
Mario Danic	40913110f0	Rename the variable	2017-02-25 02:44:31 +01:00
Mario Danic	0110e54ebe	Add new customization options	2017-02-25 02:44:31 +01:00
Mario Danic	16f1243da6	Fix project structure and prepare for branding	2017-02-25 02:44:31 +01:00