]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
commit9bdad6fdbf41ef1580e0830ce796bf8eeee90363
treeac427e59a705321b8b5e557ac5d627208805e078
parentf7727a322d1c50ffe3501c6179ce27781e7fa97e
parent6f55a528581f5e6ef830cb107f2cdf756ad2f79e
fix merge conflicts
apps/calendar/appinfo/database.xml
apps/calendar/appinfo/version