Luke Owncloud 4d07fcc1a1 Merge remote-tracking branch 'upstream/develop' into reliable_uploads ... Conflicts: src/com/owncloud/android/ui/activity/UploadFilesActivity.java		2014-11-25 14:28:05 +01:00
..
account_picker_long_click.xml	Added new contextual option in account list to allow the user modify the password	2013-06-21 13:10:13 +02:00
file_actions_menu.xml	Changes after CR	2014-09-04 18:23:39 +02:00
main_menu.xml	consistently use UploadList (instead UploadsList)	2014-11-07 15:38:21 +01:00