Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Tue, 24 Feb 2015 13:19:41 +0000 (14:19 +0100)
committermasensio <masensio@solidgear.es>
Tue, 24 Feb 2015 13:19:41 +0000 (14:19 +0100)
commit2d697473a1be0d57dcc9c4412749fd1e290d0e07
treea563549e5f373eeec8eac3fbc4edef7bf6445a1b
parente3a61d283fdd1a89cac30faacbba1863dd2907a7
parent759b5e3e72a8254965c946709af4d5e69312959f
Merge branch 'develop' into cancel_transfer_for_deleted_users
src/com/owncloud/android/ui/activity/FileDisplayActivity.java