Merge remote-tracking branch 'origin/develop' into improvements/logger
No related branches found
No related tags found
Showing
- .docker/dockerfiles/develop/Dockerfile 13 additions, 11 deletions.docker/dockerfiles/develop/Dockerfile
- .docker/dockerfiles/latest/Dockerfile 13 additions, 11 deletions.docker/dockerfiles/latest/Dockerfile
- .meteor/packages 2 additions, 1 deletion.meteor/packages
- .meteor/versions 10 additions, 10 deletions.meteor/versions
- .sandstorm/sandstorm-pkgdef.capnp 2 additions, 2 deletions.sandstorm/sandstorm-pkgdef.capnp
- .travis.yml 11 additions, 11 deletions.travis.yml
- .travis/docker.sh 6 additions, 2 deletions.travis/docker.sh
- .travis/namefiles.sh 9 additions, 7 deletions.travis/namefiles.sh
- .travis/sandstorm.sh 1 addition, 1 deletion.travis/sandstorm.sh
- .travis/setartname.sh 6 additions, 0 deletions.travis/setartname.sh
- .travis/update-releases.sh 7 additions, 0 deletions.travis/update-releases.sh
- HISTORY.md 153 additions, 21 deletionsHISTORY.md
- LICENSE 1 addition, 1 deletionLICENSE
- README.md 16 additions, 15 deletionsREADME.md
- client/helpers/log.coffee 2 additions, 2 deletionsclient/helpers/log.coffee
- client/routes/adminRouter.coffee 6 additions, 4 deletionsclient/routes/adminRouter.coffee
- client/startup/startup.coffee 3 additions, 0 deletionsclient/startup/startup.coffee
- docker-compose.yml 1 addition, 3 deletionsdocker-compose.yml
- i18n/ar.i18n.json 33 additions, 14 deletionsi18n/ar.i18n.json
- i18n/de.i18n.json 98 additions, 33 deletionsi18n/de.i18n.json
Loading
Please register or sign in to comment