Merge branch 'release/2.9.0'

bump
Merge branch 'master' into develop
2025-12-09 07:33:24 +00:00 · 2018-04-14 16:52:40 +10:00 · 2018-04-14 16:52:16 +10:00 · 2018-04-14 09:48:54 +10:00 · 2018-04-14 09:48:39 +10:00 · 2018-04-14 09:46:49 +10:00
2 changed files with 2 additions and 2 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.5.1",
+  "version": "2.9.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.5.2",
+  "version": "2.9.0",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
willyb321	f15260eda8	Merge branch 'release/2.9.0'	2018-04-14 16:52:40 +10:00
willyb321	8a82fbc76f	bump	2018-04-14 16:52:16 +10:00
willyb321	8a6202b2e3	Merge branch 'master' into develop	2018-04-14 09:48:54 +10:00
willyb321	30ae309ea6	Merge branch 'release/2.5.3'	2018-04-14 09:48:39 +10:00
willyb321	6c526eccc8	bump	2018-04-14 09:46:49 +10:00
willyb321	8b7ae22aa9	update lockfile version	2018-04-13 16:18:56 +10:00