projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95b0090 ac0a3db)
Merge pull request #2545 from colemanw/tokens
authorcolemanw <coleman@civicrm.org>
Tue, 25 Feb 2014 14:26:22 +0000 (09:26 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 25 Feb 2014 14:26:22 +0000 (09:26 -0500)
Use select2 for inserting tokens

1  2 
CRM/Utils/System.php patch | diff1 | diff2 | blob | history
css/civicrm.css patch | diff1 | diff2 | blob | history

diff --cc CRM/Utils/System.php
Simple merge
diff --cc css/civicrm.css
Simple merge