Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

This commit is contained in:
Mashy 2019-10-21 19:41:55 +10:00
commit 36c9236842
2 changed files with 4 additions and 5 deletions

View File

@ -38,7 +38,7 @@
* remove names so games/instances are copy * remove names so games/instances are copy
*$$$* *$$$*
* chatwheel * instead of red noise, red and black bar gradient
* eth adapter * eth adapter
* illusions * illusions
* vaporwave * vaporwave

View File

@ -66,9 +66,8 @@ function JoinButtons(args) {
<div class="timer-container"></div> <div class="timer-container"></div>
<div class="controls"> <div class="controls">
{discordBtn} {discordBtn}
<div class="flex"> <div></div>
<div>&nbsp;</div> <div></div>
</div>
<AccountBox /> <AccountBox />
<div class="instance-ctrl-btns"> <div class="instance-ctrl-btns">
<button disabled={true} >Chat</button> <button disabled={true} >Chat</button>