Merge branch 'merge-staging' into staging

2017-11-27 12:18:34 +01:00
parent 444ba91287 be5c5831dd
commit 812df7de6f
34 changed files with 107 additions and 1900 deletions
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -1,6 +1,5 @@
 define([
    'jquery',
-    '/bower_components/textpatcher/TextPatcher.js',
    '/common/diffMarked.js',
    '/bower_components/nthen/index.js',
    '/common/sframe-common.js',
@@ -39,7 +38,6 @@ define([

 ], function (
    $,
-    TextPatcher,
    DiffMd,
    nThen,
    SFCommon,