projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aec910f 0c7a9c3)
Merge remote-tracking branch 'upstream/develop' into develop
authorgstraube <georg.straube@googlemail.com>
Fri, 21 Aug 2015 18:45:40 +0000 (20:45 +0200)
committergstraube <georg.straube@googlemail.com>
Fri, 21 Aug 2015 18:45:40 +0000 (20:45 +0200)

Trivial merge
ownCloud Android App