Merge branch 'release/2.9.15'

2.9.15
Merge branch 'release/2.9.14'
2025-12-08 15:13:23 +00:00 · 2018-05-30 07:44:12 +10:00 · 2018-05-30 07:44:07 +10:00 · 2018-05-29 07:04:11 +10:00 · 2018-05-29 07:04:11 +10:00 · 2018-05-12 19:19:26 +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.9.14",
+  "version": "2.9.15",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.14",
+  "version": "2.9.15",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
willyb321	355d14777d	Merge branch 'release/2.9.15'	2018-05-30 07:44:12 +10:00
willyb321	4254abcc15	2.9.15	2018-05-30 07:44:07 +10:00
willyb321	be3229a57d	Merge branch 'release/2.9.14'	2018-05-29 07:04:11 +10:00
willyb321	7260d2f75d	Merge branch 'release/2.9.14' into develop	2018-05-29 07:04:11 +10:00
willyb321	5e24df467a	Merge branch 'develop'	2018-05-12 19:19:26 +10:00
willyb321	652decf6b3	Merge branch 'develop'	2018-05-04 16:22:40 +10:00
willyb321	a667fd2309	Merge remote-tracking branch 'origin/develop'	2018-05-03 10:59:27 +10:00
willyb321	e8c1ae4c89	Merge branch 'release/2.9.13'	2018-05-03 07:15:42 +10:00
willyb321	6d8c74ad3f	Merge branch 'release/2.9.12'	2018-04-28 12:15:32 +10:00
willyb321	c140856334	Merge branch 'develop'	2018-04-28 09:57:05 +10:00
willyb321	9ac6427ee0	Merge branch 'release/2.9.11'	2018-04-26 09:20:42 +10:00