Michael Gapczynski ea23854328 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php		2012-08-06 13:49:54 -04:00
..
contacts.css	Merge branch 'master' into share_api	2012-08-06 13:49:54 -04:00
jquery.Jcrop.css	Correction of path looking for apps and css	2012-06-22 20:58:52 +00:00
jquery.combobox.css	Added custom combobox widget.	2012-02-10 16:40:40 +01:00