projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b2158a8)
Merge branch 'develop' of git@github.com:owncloud/android.git into
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:01 +0000 (17:58 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:01 +0000 (17:58 +0100)
developNew

Conflicts:
res/values-fr/strings.xml


No differences found
ownCloud Android App