Merge branch 'share_link__new_share' into share_link__refresh_shares_folder_per_folder
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 6 Feb 2014 19:16:14 +0000 (20:16 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 6 Feb 2014 19:16:14 +0000 (20:16 +0100)
commit0fde0084e284ea62dbc77b20305c977808bff9a2
treedb6cbdfdb3c01610e757ca9ad3e9c46c530ba465
parentda4aaa5aa155ed319a29ae633244a5050205e988
parent3662fda2defcaeddfdfcdfe27ad23c40493ccbc6
Merge branch 'share_link__new_share' into share_link__refresh_shares_folder_per_folder
src/com/owncloud/android/ui/activity/FileDisplayActivity.java