Merge branch 'us4_view_text_files' of github.com:owncloudChalmers/android into us4_vi...
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 28 Oct 2014 18:13:03 +0000 (19:13 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 28 Oct 2014 18:13:03 +0000 (19:13 +0100)
commit073e7e46bd27f957f37f3df4a5c09decc1d8ef70
tree530e81e289eed76e44c72ae848f2fd7e601f9373
parentb1ef5d94d4c430be3bf7839eff0e7b37a03ed2b7
parent46ff60a9e760a760b478609bac68d45f8728488f
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