]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 8 Jun 2012 09:21:55 +0000 (11:21 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 8 Jun 2012 09:21:55 +0000 (11:21 +0200)
commit65cd15ca1505fd7acf4dd7b7e66702adc20e3a3d
treeb1ff475e387e1e9d533278c7464331ae12d2fd13
parent2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c
parent4768510923f6bfa3f3473874395a7a61872f1df0
fix merge conflicts
apps/calendar/templates/settings.php