Skip to content
This repository has been archived by the owner on Oct 8, 2020. It is now read-only.

Update tokens-and-mail-merge.md #225

Merged
merged 2 commits into from
Oct 29, 2017
Merged

Conversation

Clairepickle
Copy link
Contributor

@Clairepickle Clairepickle commented Oct 8, 2017

as per import request - section added on SMARTY

Resolve #190

Clairepickle and others added 2 commits October 8, 2017 14:25
as per import request - section added on SMARTY
@seancolsen seancolsen merged commit e45c329 into civicrm:master Oct 29, 2017
@seancolsen
Copy link
Contributor

seancolsen commented Oct 29, 2017

Thanks for this @Clairepickle

Sorry it took me a while to merge this. I had to do a bit of head-scratching to figure out where the content actually belongs. (Note that even though #190 has my name on it, that's just because I imported the ticket from Jira where someone else created it.)

And I wanted to roll this work into addressing these tickets as well:

Now I'm digging into re-organizing some of this content across all three of our guides. The work you've done here has made this easier. Thanks again! 😁

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants