Merge branch 'surevine:master' into master
commit
00efb4c576
|
@ -2,3 +2,4 @@ _data
|
||||||
.idea
|
.idea
|
||||||
*.iml
|
*.iml
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
*.log
|
|
@ -40,7 +40,7 @@ services:
|
||||||
- "xmpp.localhost.example:172.60.0.30"
|
- "xmpp.localhost.example:172.60.0.30"
|
||||||
- "conference.xmpp.localhost.example:172.60.0.10"
|
- "conference.xmpp.localhost.example:172.60.0.10"
|
||||||
- "conference.xmpp.localhost.example:172.60.0.20"
|
- "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"
|
- "otherxmpp.localhost.example:172.60.0.110"
|
||||||
- "conference.otherxmpp.localhost.example:172.60.0.110"
|
- "conference.otherxmpp.localhost.example:172.60.0.110"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue