Merge branch 'share_link_show_shared_files' into share_link__code_improvements
authormasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 10:14:19 +0000 (11:14 +0100)
committermasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 10:14:19 +0000 (11:14 +0100)
commit7c0accf714ec85a08c70747cf8d84dbada817a67
tree847deaa6fab1f12586891f2a44b316a9b263df5b
parent6361dd0a26eea4488da3e004968a03024dc41891
parent063ec9eff5b80ef9f8fd9ff3c400fae24c70996c
Merge branch 'share_link_show_shared_files' into share_link__code_improvements
owncloud-android-library
src/com/owncloud/android/ui/activity/FileDisplayActivity.java