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
..
attrs.xml	fix string arrays, so n.o. elements doesn't depend on translation status, make upload spinner translatable	2016-09-06 16:17:14 +02:00
bools.xml	Add documents provider	2016-06-20 22:15:02 +02:00
colors.xml	colorize quota progress bar depending on thresholds met, reformattings	2016-08-18 15:55:11 +02:00
dims.xml	layout fixes II	2016-11-01 23:35:17 +01:00
oauth2_configuration.xml	Update UI for login view according setup config	2016-04-29 12:35:53 +02:00
setup.xml	Fix crash opening or sending files in Android 7	2016-11-02 23:34:50 +01:00
strings.xml	fixed strings (oC->Nc and ... --> …)	2016-11-02 12:09:51 +01:00
styles.xml	correct search view UI-behavior	2016-08-03 19:20:44 +02:00
versioned_styles.xml	fixed button style blue/grey	2015-08-12 18:54:27 +02:00