projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bbb484 bb8a10f)
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:54:47 +0000 (17:54 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:54:47 +0000 (17:54 +0100)

Trivial merge
ownCloud Android App