omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 04:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	resources/assets/js/pages/settings/admin-supplier.vue
#	vendor/composer/autoload_static.php
This commit is contained in:
Jack Goh
2018-07-05 11:52:38 +08:00
parent 340381d0b3 09f2dcf579
commit 560035be09
20 changed files with 15804 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -30,13 +30,13 @@
"vee-validate": "^2.1.0-beta.5",
"vform": "^1.0.0",
"vue": "^2.5.16",
"vue-axios": "^2.1.1",
"vue-i18n": "^7.6.0",
"vue-loader": "^14.2.2",
"vue-meta": "^1.4.4",
"vue-router": "^3.0.1",
"vuex": "^3.0.1",
"vuex-router-sync": "^5.0.0",
"webpack": "^3.11.0"
"vuex-router-sync": "^5.0.0"
},
"devDependencies": {
"@vue/cli-plugin-eslint": "^3.0.0-beta.6",