projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 49e8daf)
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)
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found
ownCloud Android App