diff options
| author | Yukai Huang | 2016-10-11 18:39:15 +0800 |
|---|---|---|
| committer | Yukai Huang | 2016-10-11 18:40:23 +0800 |
| commit | 6e651c8108783d224c5f40d1bb8047a9ebbeff00 (patch) | |
| tree | c7d501cc6ebb46399c397768b3f58ef05034c522 /.gitignore | |
| parent | 21028c57735028574c769fb6650322eb3f0cb924 (diff) | |
| parent | cd9f8fe36b707ff5a9f8f7be4d55145ddee97f3a (diff) | |
Merge branch 'master' into webpack-frontend
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -19,7 +19,7 @@ backups/ # ignore config files config.json -public/js/common.js +public/js/config.js .sequelizerc # ignore webpack build |