Merge branch 'master' into ui-2

2017-07-10 17:36:55 +02:00
parent 801b6e0ded 15aebacbe7
commit 3d24ae0981
52 changed files with 1011 additions and 442 deletions
--- a/js/webpack/app.js
+++ b/js/webpack/app.js
@@ -99,7 +99,19 @@ module.exports = {
          }
        ]
      },
-
+      {
+        test: /\.md$/,
+        use: [
+          {
+            loader: 'html-loader',
+            options: {}
+          },
+          {
+            loader: 'markdown-loader',
+            options: {}
+          }
+        ]
+      },
      {
        test: /\.css$/,
        include: [ /src/ ],