]> source.dussan.org Git - nextcloud-server.git/commit
conflicts solved
authorMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Thu, 6 Oct 2011 20:40:11 +0000 (22:40 +0200)
committerMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Thu, 6 Oct 2011 20:40:11 +0000 (22:40 +0200)
commite345fbd386f3e2c63b6682ae245beb7b24af08fb
tree1d7d2e6d2acb193252cd158cec2ab54d501825a0
parentbb26fe93008bd6fd5031956d654a5ab9c1950416
parent3cc7212c8282d5be2d53ab3b5aa35ec6247cfcbe
conflicts solved
apps/calendar/css/style.css
apps/calendar/templates/settings.php