Merge branch 'develop' into release-1.6.0
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 18 Sep 2014 12:27:13 +0000 (14:27 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 18 Sep 2014 12:27:13 +0000 (14:27 +0200)
commitaa354e5d73d2e1777b93e957220990d145f3b6ba
tree23a30d251ad48c2e728529df987e1ed5520818e8
parent5a54bfdc4d91ee395552f39960ab3f5ba2bbabdb
parent02d085ed0ee9490d1754fdfde571f6c05ba6c5fd
Merge branch 'develop' into release-1.6.0
res/values/strings.xml
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java