Thomas Tanghus c3fa18e4a7 Merge branch 'contacts_backends' into contacts_oc6 ...

Conflicts:
	contacts/ajax/categories/add.php
	contacts/ajax/contact/add.php
	contacts/appinfo/app.php
	contacts/appinfo/migrate.php
	contacts/css/contacts.css
	contacts/index.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/app.php
	contacts/lib/carddav/addressbook.php
	contacts/lib/sabre/backend.php
	contacts/lib/vcard.php
	contacts/templates/contacts.php
	contacts/thumbnail.php

2013-04-17 15:07:59 +02:00

..

app.php

Merge branch 'contacts_backends' into contacts_oc6

2013-04-17 15:07:59 +02:00

classpath.php

Contacts: Improved image upload

2013-04-08 22:35:28 +02:00

database.xml

Contacts: Concept db layout.

2013-03-16 15:55:03 +01:00

info.xml

Set required owncloud version to 4.93

2013-02-24 17:39:59 +01:00

migrate.php

Merge branch 'contacts_backends' into contacts_oc6

2013-04-17 15:07:59 +02:00

remote.php

Contacts: Debug Sabre exceptions if DEBUG is set

2013-04-12 11:43:56 +02:00

routes.php

Contacts: ksort on array values

2013-04-08 22:39:22 +02:00

update.php

Fix whitespace in contacts

2012-09-07 14:32:45 +02:00

version

Bump version to trigger db update and service creation.

2012-11-13 00:31:10 +01:00