projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b1ef5d9 46ff60a)
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)
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


Trivial merge
ownCloud Android App