babelouest 229c49d43e Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui ... Conflicts: js/addressbooks.js templates/contacts.php		2014-05-10 12:09:23 -04:00
..
contacts.css	Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui	2014-05-10 12:09:23 -04:00
jquery.combobox.css	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
jquery.ocaddnew.css	Wrong height on oc-addnew elements	2014-03-04 18:25:43 +01:00
placeholder_polyfill.css	Contacts: Added customized Modernizr and replaced placeholder polyfill	2012-12-17 22:41:21 +01:00
placeholder_polyfill.min.css	Contacts: Added customized Modernizr and replaced placeholder polyfill	2012-12-17 22:41:21 +01:00