Merge remote-tracking branch 'upstream/master' into feat-dockerfile

This commit is contained in:
kaiyou 2018-04-08 17:56:44 +02:00
commit a13b7860c6
179 changed files with 8715 additions and 4375 deletions

2
.gitignore vendored
View file

@ -47,3 +47,5 @@ static/client/register/register_config.js
env/
*.config
.vscode/