jbtbnl 18c7e95380 Merge branch 'master' into import-new-ui ... Conflicts: css/contacts.css		2014-09-15 11:14:31 +02:00
..
contacts.css	Merge branch 'master' into import-new-ui	2014-09-15 11:14:31 +02: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