Merge branch 'share_link__new_share' into release-1.5.4
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Feb 2014 08:23:40 +0000 (09:23 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Feb 2014 08:23:40 +0000 (09:23 +0100)
commitcba8baa98d3b2a15ca8f7fce8302bd64e83c6976
tree6c4d76d4e410f6bb9175088584c18a1e11adb2f8
parentfdedbaa18f0a228fcb2b4fab781e3096979c7e60
parent3662fda2defcaeddfdfcdfe27ad23c40493ccbc6
Merge branch 'share_link__new_share' into release-1.5.4
src/com/owncloud/android/ui/activity/FileDisplayActivity.java