Merge branch 'master' into hangup

This commit is contained in:
Beatrice Olivera
2018-09-04 14:53:57 +01:00
committed by GitHub
2 changed files with 8 additions and 7 deletions

View File

@@ -1,3 +1,4 @@
<button id="test-btn" class="btn btn-primary">Test Connection</button>
<div id="join-btn" data-room="<%= @chat_room.id %>"></div>
<div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div>