therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update branch and fix merge conflicts

Browse source
This commit is contained in:
Shpuld Shpuldson 2017-06-15 23:25:19 +03:00
commit e0e8965c08
52 changed files with 876 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

8
package.json
View file

@ -23,11 +23,11 @@
"object-path": "^0.11.3",
"sanitize-html": "^1.13.0",
"sass-loader": "^4.0.2",
"vue": "^2.1.0",
"vue-router": "^2.2.0",
"vue-template-compiler": "^2.1.10",
"vue": "^2.3.4",
"vue-router": "^2.5.3",
"vue-template-compiler": "^2.3.4",
"vue-timeago": "^3.1.2",
"vuex": "^2.1.0"
"vuex": "^2.3.1"
},
"devDependencies": {
"autoprefixer": "^6.4.0",