]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 30 Jun 2012 10:44:45 +0000 (12:44 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 30 Jun 2012 10:44:51 +0000 (12:44 +0200)
commit6e6f90a8a242c96cc90a5ba35248f7abdfddd6b4
tree567a3a8227de5e9026b35d09a518f18baf7e70cc
parent91d92aed0284a0af83fd656a51deb9335e6b4703
parentedc6a648d1d667d3179e51c98ab937cf35e4a333
fix merge conflicts
apps/calendar/appinfo/app.php