jbtbnl a9ade3079d Merge remote-tracking branch 'origin/master' into import-new-ui ... Conflicts: css/contacts.css lib/controller/importcontroller.php		2014-08-26 17:42:14 +02:00
..
admin.php	forgotten translation tag	2014-05-19 15:17:32 +02:00
contacts.php	Merge remote-tracking branch 'origin/master' into import-new-ui	2014-08-26 17:42:14 +02:00
importdialog.html	Use p(), not echo	2014-03-25 01:16:08 +01:00