Merge branch 'surevine:master' into master

pull/47/head
Emiel van der Herberg 2021-09-30 13:31:19 +02:00 committed by GitHub
commit 00efb4c576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ _data
.idea
*.iml
.DS_Store
*.log

View File

@ -40,7 +40,7 @@ services:
- "xmpp.localhost.example:172.60.0.30"
- "conference.xmpp.localhost.example:172.60.0.10"
- "conference.xmpp.localhost.example:172.60.0.20"
- "conference.xmpp3.localhost.example:172.60.0.30"
- "conference.xmpp.localhost.example:172.60.0.30"
- "otherxmpp.localhost.example:172.60.0.110"
- "conference.otherxmpp.localhost.example:172.60.0.110"