masensio 75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server ... Conflicts: owncloud-android-library src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java		2015-06-15 14:51:13 +02:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.xml	Update year in license	2015-03-05 13:27:45 +01:00
colors.xml	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
dims.xml	Merge branch 'develop2' into imageGrid2	2015-01-19 21:02:37 +01:00
drawer_resources.xml	Disable 'Accounts' in Navigation Drawer	2015-05-29 11:32:36 +02:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	Rename the flag to show my wish that someday the app will allow to share with other users too	2015-05-08 11:17:39 +02:00
strings.xml	Merge branch 'develop' into forbidden_characters_from_server	2015-06-15 14:51:13 +02:00
styles.xml	Fixed style in log-in activity; should be Light, as before	2015-05-29 13:30:02 +02:00
versioned_styles.xml	Add actionBar	2015-05-25 12:39:05 +02:00