Merge branch 'master' into develop

2017-10-22 11:51:14 +02:00
parent a56287c2dc 4aa227dd84
commit fff0fa2aee
85 changed files with 4206 additions and 3294 deletions
@@ -26,6 +26,10 @@ module.exports = merge(common, {
    ]
  },

+  devServer: {
+    stats: 'errors-only',
+  },
+
  plugins: [
    new ExtractTextPlugin({
      filename: 'grafana.[name].css',