Nathan Gray 2eda1476cf Merge custom fields when merging contacts		2010-11-29 20:48:15 +00:00
..
importexport/definitions	Backport 29678 - Fix missed class name change in default importexport profile	2010-09-07 22:12:55 +00:00
inc	Merge custom fields when merging contacts	2010-11-29 20:48:15 +00:00
setup	removed filemanager icons, as they require for correction function a stylite.links stream wrapper from EPL	2010-10-26 13:32:41 +00:00
templates/default	removed filemanager icons, as they require for correction function a stylite.links stream wrapper from EPL	2010-10-26 13:32:41 +00:00
csv_import.php	dont use the global template object anymore; do our own now	2010-11-29 11:27:55 +00:00