Merge branch 'development'

LaravelRUS · May 18, 2018 · 4919660 · 4919660
2 parents f91a4c3 + 6d435d9
commit 4919660
Show file tree

Hide file tree

Showing 111 changed files with 12,917 additions and 3,252 deletions.
diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/mix-manifest.json b/mix-manifest.json
@@ -1,3 +1,6 @@
 {
-  "/public/default/js/admin-app.js": "/public/default/js/admin-app.js"
+    "/public/default/js/admin-app.js": "/public/default/js/admin-app.js",
+    "/public/default/css/admin-app.css": "/public/default/css/admin-app.css",
+    "/public/default/js/vue.js": "/public/default/js/vue.js",
+    "/public/default/js/modules.js": "/public/default/js/modules.js"
 }