Merge branch 'pr/311' into pull_request_311_with_develop
authormasensio <masensio@solidgear.es>
Fri, 14 Feb 2014 09:59:26 +0000 (10:59 +0100)
committermasensio <masensio@solidgear.es>
Fri, 14 Feb 2014 09:59:26 +0000 (10:59 +0100)
commit296df1bb6550081535ff06dfacd1d28345c51545
tree1e18e6a3afe703f505eb0674542e60dc4705d574
parent3afa50db2717afedd5f259f90c62627e95e058ec
parent0d01bf30c3f0bfeedce078410be001daa5199763
Merge branch 'pr/311' into pull_request_311_with_develop
res/menu/file_actions_menu.xml
res/values-de-rCH/strings.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values-en-rGB/strings.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java