Georg Ehrke e5c2d088eb fix merge conflicts

2012-05-07 11:47:14 +02:00

..

app.php

push changes

2012-05-05 22:54:14 +02:00

database.xml

Database.xml

2011-08-06 23:09:38 +02:00

info.xml

added a nice API to get the installes Apps with names, urls and icon from the outside.

2012-05-05 23:42:38 +02:00

migrate.php

ported oc_db

2012-05-03 13:06:08 +02:00

remote.php

make carddav work with remote.php

2012-05-07 11:24:19 +02:00

version

keep version numbers in their own files for faster reading

2012-04-14 16:29:11 +02:00