Georg Ehrke 469e983a02 fix merge conflicts		2011-12-21 22:16:46 +01:00
..
app.php	fix merge conflicts	2011-12-21 22:16:46 +01:00
database.xml	removed description field for calendar	2011-10-08 13:28:01 +02:00
info.xml	Add flag in info.xml to control the apps that are installed by default	2011-09-27 22:36:14 +02:00