Merge tag '1.2.2' into develop

1.2.2
2020-02-21 15:22:43 -05:00 · 2020-02-21 15:22:43 -05:00 · 74de85615c
commit 74de85615c
parent 5d45b9e776 2a99edb4b8
4 changed files with 4 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# BRAID v1.2
+# BRAID v1.2.2
 > Websocket server for the Measure platform

 [![Build Status](https://semaphoreci.com/api/v1/projects/7767f0f3-4da6-4c84-9167-4db5402a3262/2573412/badge.svg)](https://semaphoreci.com/yardstick/braid)
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "braid",
-  "version": "1.2",
+  "version": "1.2.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "braid",
-  "version": "1.2.0",
+  "version": "1.2.2",
  "description": "",
  "main": "index.js",
  "scripts": {
--- a/src/config/app.ts
+++ b/src/config/app.ts
@ -1,5 +1,5 @@
 module.exports = {
-  version : '1.2',
+  version : '1.2.2',
  whitelist : (process.env.WHITELIST || 'http://admin.localhost').split(','),
  secret : process.env.SECRET || 'test',
  devToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImNsaWVudCI6InRlc3QiLCJjbGllbnRfdHlwZSI6InNpdGUiLCJ1c2VyX3R5cGUiOiJ1c2VyIiwidXNlcl9pZCI6MjAwLCJjaGFubmVsIjoidGVzdF9jaGFubmVsIn0sImF1ZCI6ImludGVybmFsIiwiaXNzIjoiWWFyZHN0aWNrIFNvZnR3YXJlIiwic3ViIjoiQnJhaWQgSldUIn0.5KNCov_EW1cycT4Ay0oSvk4Z4PHFedd3bWOyqkHHTBQ',