Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Wed, 3 Dec 2014 14:08:45 +0000 (15:08 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Wed, 3 Dec 2014 14:08:45 +0000 (15:08 +0100)
commit49e8dafac05eef53cabbff8f3efbe312b8d5b80b
treebd67bf2470a745b046f95d032a470b66dce21fe4
parentd5566ce0a3c8ee8295f8c209a7d2a02f0f49faa2
parent50e39f044f0ac1bbd572ba9eb8178a415791a8a5
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java