]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 20:26:55 +0000 (22:26 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Apr 2012 20:26:55 +0000 (22:26 +0200)
commitdc18e65b4675d1d458a42ef8e6125bf6680ba157
tree30072917dd3290cd65a8cfac764feb26e56594c1
parent8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0
parent12818093007d5bdce5519b5015e2a0748c98e24d
fix merge conflicts
apps/calendar/appinfo/app.php
apps/calendar/templates/part.choosecalendar.rowfields.php
core/css/styles.css