projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 10a12fb)
Merge branch 'gradleWithInternalDependency' into us4_view_text_files
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Mon, 24 Nov 2014 11:57:02 +0000 (12:57 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Mon, 24 Nov 2014 11:57:02 +0000 (12:57 +0100)
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found
ownCloud Android App