forked from extern/docker
fix rebase mistake
This commit is contained in:
parent
f0e734a2cf
commit
9ac7e309de
@ -205,11 +205,8 @@ volumes:
|
|||||||
bigbluebutton:
|
bigbluebutton:
|
||||||
vol-freeswitch:
|
vol-freeswitch:
|
||||||
vol-kurento:
|
vol-kurento:
|
||||||
<<<<<<< HEAD
|
|
||||||
html5-static:
|
html5-static:
|
||||||
=======
|
|
||||||
vol-libreoffice:
|
vol-libreoffice:
|
||||||
>>>>>>> b6193c1 (v2.3: dockerized libreoffice)
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
bbb-net:
|
bbb-net:
|
||||||
|
Loading…
Reference in New Issue
Block a user