Merge branch 'share_link_show_shared_files' into share_link__new_share
authormasensio <masensio@solidgear.es>
Thu, 30 Jan 2014 17:54:54 +0000 (18:54 +0100)
committermasensio <masensio@solidgear.es>
Thu, 30 Jan 2014 17:54:54 +0000 (18:54 +0100)
commitc550c8701bcb477e2d2a6af7c68e5154e5612102
tree46c580811a91d707ed3d4e6bf09ae25fce68db9c
parent426d7a3f88c1fe4eb3833659a89fa95e6462f64e
parent61f943ca7e5ccf32a8619bc2132691813de391bb
Merge branch 'share_link_show_shared_files' into share_link__new_share
src/com/owncloud/android/ui/activity/FileDisplayActivity.java