]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 21 Apr 2012 20:12:31 +0000 (22:12 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 21 Apr 2012 20:12:31 +0000 (22:12 +0200)
commite29ae46609f42a03ade20c7f935e2cded84db51f
treeb896f79353e792c5d34d7dc8dc9220c49bbfd6df
parentcf492a96496920c42f3ad384f5ca0886a5323c72
parent6bfe2289be05e9f54272a86a0f957ec41ef32e28
fix merge conflicts
apps/calendar/ajax/import/import.php
apps/calendar/export.php