]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into calendar
authorGeorg Ehrke <ownclouddev@georgswebsite.de>
Mon, 2 Jan 2012 10:41:18 +0000 (11:41 +0100)
committerGeorg Ehrke <ownclouddev@georgswebsite.de>
Mon, 2 Jan 2012 10:41:18 +0000 (11:41 +0100)
commit30857b24eae919a0dd55e9770ec07efc3f5905ae
tree269170884dc134560430a62ea9c7c0f71d104229
parent5ccd26959f5727bfad49bbfc6b6735dfed997fef
parent4374d55e5e020a1f2673a18991be6f2560e9f2c3
Merge branch 'master' into calendar