tobiasKaminsky 79cb6106fd Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps ... Conflicts: src/com/owncloud/android/utils/DisplayUtils.java		2014-11-12 09:02:23 +01:00
..
attrs.xml
bools.xml
colors.xml
dims.xml	Adjust the thumbnails size to the size used on screen	2014-11-03 11:27:51 +01:00
oauth2_configuration.xml
setup.xml	Fixed mess created with b9eaffd	2014-09-12 13:49:37 +02:00
strings.xml	Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps	2014-11-12 09:02:23 +01:00
styles.xml
versioned_styles.xml