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/components/styles.js
+++ b/assets/js/src/newsletter_editor/components/styles.js
@@ -83,7 +83,7 @@ define([
    this.setGlobalStyles(globalStyles);
  });

-  App.on('start', function(App) {
+  App.on('start', function (App) {
    var stylesView = new Module.StylesView({ model: App.getGlobalStyles() });
    App._appView.showChildView('stylesRegion', stylesView);
  });