jabarros ba6c6375cf Merge branch 'develop' into ADFS_auth_support ... Conflicts: res/values/strings.xml		2014-09-09 13:17:41 +02:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.xml	REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity	2013-06-04 14:30:29 +02:00
colors.xml	Change the star and downloaded/downloading/uploading icons in list_item layout desing	2014-07-09 09:09:37 +02:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	Update branding: instead of specific option, make that using SAML authentication implies enabling the SingleSessionManager.	2014-06-16 13:18:29 +02:00
strings.xml	Merge branch 'develop' into ADFS_auth_support	2014-09-09 13:17:41 +02:00
styles.xml	Added support for sharing files:	2013-11-24 10:00:04 +01:00
versioned_styles.xml	Fixed contrast of text in notifications for Android 2.x and 3.x	2014-03-20 12:56:44 +01:00