]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f0728c7 3bd9129)
Merge remote-tracking branch 'dweismueller/owncloud-7' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jul 2014 11:15:33 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jul 2014 11:15:33 +0000 (13:15 +0200)

Trivial merge
IPFire 2.x development tree