fix(mail-merge): Correctly update tokens when new csv is imported

- MailMergeBodyToken now keeps internal state to track when the column
its linked to has changed
- Fix subject regex
This commit is contained in:
Juan Tejada 2016-06-10 00:27:14 -07:00
parent 147f7f7219
commit 01814473f5

@ -1 +1 @@
Subproject commit 75d429ceed1c35a09faaadda235157167fc1eeb6
Subproject commit d7b614d5a898ff2a4f6469c4f9e42197ef27bd2b