Merge tag '1.4.5' into develop

1.4.5
This commit is contained in:
ntr
2019-09-15 17:26:42 +10:00
6 changed files with 12 additions and 10 deletions
+1 -1
View File
@@ -1 +1 @@
1.4.4 1.4.5
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "mnml-client", "name": "mnml-client",
"version": "1.4.4", "version": "1.4.5",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "mnml-client", "name": "mnml-client",
"version": "1.4.4", "version": "1.4.5",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
+3 -1
View File
@@ -76,7 +76,9 @@ function Controls(args) {
background: displayColour, background: displayColour,
}; };
const timer = ( const timer = instance.phase !== 'InProgress'
? null
: (
<div class="timer-container"> <div class="timer-container">
<div class="timer" style={timerStyles} >&nbsp;</div> <div class="timer" style={timerStyles} >&nbsp;</div>
</div> </div>
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "mnml-ops", "name": "mnml-ops",
"version": "1.4.4", "version": "1.4.5",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "mnml" name = "mnml"
version = "1.4.4" version = "1.4.5"
authors = ["ntr <ntr@smokestack.io>"] authors = ["ntr <ntr@smokestack.io>"]
[dependencies] [dependencies]