Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 07:45:52 +0000 (08:45 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 07:45:52 +0000 (08:45 +0100)
commit99686805e16c9891bb68c0ae4e7478913e16270e
tree4b79c6d4e7dd1257961b40331ca958d5ae0e9d7b
parent42834b213ae0ddc35b57d5aa79ffd24afde5a5da
parent29318f128dd9204b9dd3e69fd68802963d942165
Merge branch 'develop' into send_file_pr311_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/strings.xml
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java