shiziyuan9527 e1d8323604 Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # frontend/src/i18n/en_US.js # frontend/src/i18n/zh_CN.js		2020-02-26 18:43:13 +08:00
..
public	frontend backend	2020-02-03 14:04:27 +08:00
src	Merge remote-tracking branch 'origin/dev' into dev	2020-02-26 18:43:13 +08:00
.editorconfig	frontend backend	2020-02-03 14:04:27 +08:00
.gitignore	ignore .settings	2020-02-03 18:47:15 +08:00
babel.config.js	frontend backend	2020-02-03 14:04:27 +08:00
package.json	删除临时添加的依赖	2020-02-15 14:05:15 +08:00
pom.xml	package name changed.	2020-02-03 16:30:16 +08:00
vue.config.js	8888 port not working on my mac	2020-02-03 15:16:37 +08:00