Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
authormasensio <masensio@solidgear.es>
Tue, 25 Aug 2015 12:53:42 +0000 (14:53 +0200)
committermasensio <masensio@solidgear.es>
Tue, 25 Aug 2015 12:53:42 +0000 (14:53 +0200)
commitb81de1d54710175ce660753e31726fe2174301ff
tree19dd1567ba367a40f3faf46093410f49dd3a19ab
parenteda6f714913d16cdfd269b48c2afd712b3232506
parentb572e4b935dc5cfc0f20af2b7104146a180fa5de
Merge branch 'master' into create_folder_button_on_action_bar_for_uploader

Conflicts:
res/layout/uploader_layout.xml
res/layout/uploader_layout.xml
src/com/owncloud/android/ui/activity/Uploader.java