60 commits

Author	SHA1	Message	Date
Nextcloud bot	fb4374d9fc	[tx-robot] updated from transifex	2017-04-20 00:21:12 +00:00
Nextcloud bot	5d3f5eb698	[tx-robot] updated from transifex	2017-04-11 00:20:47 +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
AndyScherzinger	02e94fb21a	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-21 16:48:42 +01:00
AndyScherzinger	4077980ea0	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-16 23:09:58 +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