Commit graph

11 commits

Author SHA1 Message Date
Mario Danic
1732f7dc73 Some work on Firebase integration 2017-03-06 09:58:50 +01:00
Mario Danic
21e8f5530b Merge branch 'master' into branding 2017-03-06 08:10:16 +01:00
Mario Danic
b7e41eeff1 Fix gradle and supresswarnings issue 2017-03-05 21:20:54 +01:00
Mario Danic
db829c5e56 Remove useless files 2017-03-05 21:11:29 +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
364d82c0c0 Clean up things 2017-02-27 11:10:34 +01:00
Mario Danic
1052986243 Fix authorities 2017-02-25 03:43:08 +01:00
Mario Danic
7b57687fed Remove majority of custom folder 2017-02-25 02:44:32 +01:00
Mario Danic
749cbcf31c Move the generic MainApp 2017-02-25 02:44:31 +01:00
Mario Danic
dba8c4ed6e Move things around 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