Merge branch 'share_link__new_share' into share_link__new_share_menu
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 3 Feb 2014 08:46:26 +0000 (09:46 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 3 Feb 2014 08:46:26 +0000 (09:46 +0100)
commit59513cd56ddd82118b96df9a5485406338dfb5ea
tree9ebdb7b034429e05c955378d711ee61e9b47a216
parentfbe5f83aeeb930635ba6dc503324f6edc902d906
parent261d8a5167571ffbaa447cce8df24f32a53faf7d
Merge branch 'share_link__new_share' into share_link__new_share_menu
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java