Nathan Gray 21781271e4 Fix some problems with merging into email files: ... - Use correct merge sub-class when merging multiple entries - Accept merge placeholders in to/cc/bcc fields (displayed as invalid, but still accepted) - Use merge placeholders to pull addresses from associated entry		2015-06-02 21:21:21 +00:00
..
doc	Creating branches/14.2	2015-01-21 19:49:09 +00:00
inc	Fix some problems with merging into email files:	2015-06-02 21:21:21 +00:00
js	Creating branches/14.2	2015-01-21 19:49:09 +00:00
lang	Fix some missing translation in mail folder acl and edit account	2015-04-22 10:37:16 +00:00
setup	Creating branches/14.2	2015-01-21 19:49:09 +00:00
templates	Fix size of users icon in edit account dialog	2015-04-24 15:31:23 +00:00
test.php	Creating branches/14.2	2015-01-21 19:49:09 +00:00