projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebe88fd b315fbb)
Merge pull request #5386 from colemanw/CRM-15706
authorcolemanw <coleman@civicrm.org>
Mon, 23 Mar 2015 15:16:51 +0000 (11:16 -0400)
committercolemanw <coleman@civicrm.org>
Mon, 23 Mar 2015 15:16:51 +0000 (11:16 -0400)
CRM-15706 - Add Angular help directive

1  2 
js/angular-crmMailing/directives.js patch | diff1 | diff2 | blob | history
partials/crmMailing/preview.html patch | diff1 | diff2 | blob | history

diff --cc js/angular-crmMailing/directives.js
Simple merge
diff --cc partials/crmMailing/preview.html
Simple merge