David A. Velasco aa0e4b8cc8 Fix crash opening or sending files in Android 7 ... # Conflicts: # res/values/setup.xml # src/com/owncloud/android/ui/activity/Preferences.java		2016-11-02 23:34:50 +01:00
..
authenticator.xml	replace launcher icon including seasonal icon removal	2016-06-09 17:52:35 +02:00
exposed_filepaths.xml	Fix crash opening or sending files in Android 7	2016-11-02 23:34:50 +01:00
preferences.xml	further CR fixes, fixed comment in layout/migration_layout.xml	2016-11-02 12:09:52 +01:00
syncadapter_files.xml	Update year in license	2015-03-05 13:27:45 +01:00
users_and_groups_searchable.xml	minor search provider config	2016-06-09 19:16:14 +02:00