Merge branch 'master' into test1

ignore editor backups and minor change
2018-06-28 14:49:49 +02:00 · 2018-06-28 12:04:01 +02:00
2 changed files with 2 additions and 0 deletions
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -0,0 +1 @@
+*~
--- a/src/main.ts
+++ b/src/main.ts
@@ -123,3 +123,4 @@ app.listen(config.dict.httpPort, () => {
 })
 logger.info("Homepage running")

+
Author	SHA1	Message	Date
Wolfgang Hottgenroth	990ac05bba	Merge branch 'master' into test1	2018-06-28 14:49:49 +02:00
Wolfgang Hottgenroth	f71211fe55	ignore editor backups and minor change	2018-06-28 12:04:01 +02:00