]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into calendar_sharing
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 29 Mar 2012 21:19:31 +0000 (23:19 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 29 Mar 2012 21:19:31 +0000 (23:19 +0200)
commitd15959d5732a7fd4972849c4d81f7178f8d6684b
tree7be4dc511236c57a5572d1765f59c7cc07828179
parentede0a675bc6f411f04c3bb889e1375aff6e7c13d
parentf74d11c0c3c4a3bcd733499edd63f8e31389a3a3
Merge branch 'master' into calendar_sharing