From: Jorge Antonio Diaz-Benito Soriano Date: Tue, 28 Oct 2014 18:13:03 +0000 (+0100) Subject: Merge branch 'us4_view_text_files' of github.com:owncloudChalmers/android into us4_vi... X-Git-Tag: oc-android-1.8~17^2~8^2~14 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/073e7e46bd27f957f37f3df4a5c09decc1d8ef70?ds=sidebyside;hp=--cc Merge branch 'us4_view_text_files' of github.com:owncloudChalmers/android into us4_view_text_files Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java --- 073e7e46bd27f957f37f3df4a5c09decc1d8ef70