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

..

contacts.php

Merge branch 'contacts_backends' into contacts_oc6

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

part.cropphoto.php

Replace echo with p

2013-02-28 18:26:55 +01:00

settings.php

Replace echo with p

2013-02-28 18:26:55 +01:00