masensio 066cd5aab3 Merge branch 'develop' into contact_settings ... Conflicts: res/values/strings.xml		2013-10-15 14:07:59 +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
branding.xml	Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration	2013-07-25 17:29:52 +02:00
colors.xml	Copyright note fixes	2013-04-17 12:26:13 +02:00
oauth2_configuration.xml	Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration	2013-07-25 17:29:52 +02:00
setup.xml	Set SSO flag to OFF	2013-08-27 14:58:56 +02:00
strings.xml	Merge branch 'develop' into contact_settings	2013-10-15 14:07:59 +02:00
styles.xml	Fixed orientation changes in SSO dialog with WebView	2013-08-21 18:51:13 +02:00
urls.xml	Copyright note fixes	2013-04-17 12:26:13 +02:00