projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ba6c637)
Merge branch 'develop' into ADFS_auth_support
authorjabarros <jabarros@solidgear.es>
Tue, 9 Sep 2014 11:17:41 +0000 (13:17 +0200)
committerjabarros <jabarros@solidgear.es>
Tue, 9 Sep 2014 11:17:41 +0000 (13:17 +0200)
Conflicts:
res/values/strings.xml


No differences found
ownCloud Android App