mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
9802 commits 221 branches 1589 tags 640 MiB
Commit graph

2 commits

Author SHA1 Message Date
AndyScherzinger
de825e2238
Merge branch 'master' of https://github.com/nextcloud/android into integration-with-master 
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
#	src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
#	src/main/res/values-en-rGB/strings.xml
 2017-04-03 23:20:30 +02:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00
Renamed from res/layout/text_file_preview.xml (Browse further)