Merge branch 'share_link__new_share' into setup_additions
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 6 Feb 2014 12:58:41 +0000 (13:58 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 6 Feb 2014 12:58:41 +0000 (13:58 +0100)
commit4db5295f560dc2cc5deefcbd2b6c397738003f6b
treedfa3916c323f51feb410911f1db516d4785684a6
parentfc09783c1da2a49d4d7fe63071f3132b1b772edd
parent45b73934faa70408007ca4461d8a514282806c3a
Merge branch 'share_link__new_share' into setup_additions
src/com/owncloud/android/ui/activity/FileDisplayActivity.java