Merge branch 'owncloud' 2.0
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 30 Jul 2016 09:21:23 +0000 (11:21 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 30 Jul 2016 09:21:23 +0000 (11:21 +0200)
commit05211e1685df6f1692cd7bf8a89a2457c1101b7a
treea9666cdcb55059a9659faa6a5abf8a38bb10a46b
parentbac2d500f92d4cc1c19cef8c9a3d6717b963d657
parent7306aaf8a461398a7bd8a802a4aac434737ec64e
Merge branch 'owncloud'