rebasing on master

2017-09-27 12:29:19 +00:00
parent c29dc8b4c7
commit 4e2e9f6f8f
38 changed files with 249 additions and 249 deletions
--- a/assets/js/src/newsletter_editor/blocks/text.js
+++ b/assets/js/src/newsletter_editor/blocks/text.js
@@ -94,7 +94,7 @@ define([
    }
  });

-  App.on('before:start', function(App) {
+  App.on('before:start', function (App) {
    App.registerBlockType('text', {
      blockModel: Module.TextBlockModel,
      blockView: Module.TextBlockView