Merge branch 'develop'

praxisnetau · Jun 12, 2018 · 99d9092 · 99d9092
2 parents 68f3a58 + 2aacbd7
commit 99d9092
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
       "name": "Colin Tucker",
       "role": "Developer",
       "email": "colin@praxis.net.au",
-      "homepage": "http://www.praxis.net.au"
+      "homepage": "https://www.praxis.net.au"
     }
   ],
   "require": {

diff --git a/webpack.config.js b/webpack.config.js
@@ -15,7 +15,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 // Define Base:
 
-const BASE = '/resources/silverware/social';
+const BASE = '/resources/vendor/silverware/social';
 
 // Define Paths: