]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into calendar_sharing
authorGeorg Ehrke <dev@georgswebsite.de>
Mon, 26 Mar 2012 19:46:40 +0000 (21:46 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Mon, 26 Mar 2012 19:46:40 +0000 (21:46 +0200)
commita867bcab465c1924c5baed60499ebd2c3eb7b014
tree3f9a0dbeffd10209d476ac5dffe0f942f6d1a9fc
parentf479105f5e50ba915b9dbed3dd049f08e35fa591
parent31e20d22834fd492f97ae38e6919f798ab6be932
Merge branch 'master' into calendar_sharing