Merge branch 'master' into webpack-frontend
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -19,7 +19,7 @@ backups/
|
||||
|
||||
# ignore config files
|
||||
config.json
|
||||
public/js/common.js
|
||||
public/js/config.js
|
||||
.sequelizerc
|
||||
|
||||
# ignore webpack build
|
||||
|
||||
Reference in New Issue
Block a user