Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09
[civicrm-core.git] / templates / CRM / Badge / Form /
drwxr-xr-x   ..
-rw-r--r-- 1340 Layout.js
-rw-r--r-- 7177 Layout.tpl