Merge branch 'templates' into staging

2017-04-10 14:19:48 +02:00
parent 63a130c678 bd16e0f0e7
commit cfc5d634f4
11 changed files with 194 additions and 7 deletions
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -32,6 +32,7 @@ define(function() {
        '#FF00C0', // hot pink
        '#800080', // purple
    ];
+    config.enableTemplates = true;

    return config;
 });