Merge branch 'master' into develop

This commit is contained in:
Unknown
2018-01-24 08:42:37 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -1,3 +1,6 @@
#2.5.0
* Willyb321 fixed engineering. Some stuff doesn't work. We currently believe this is FDevs fault and not ours.
#2.4.3 #2.4.3
* T10 Defender * T10 Defender

View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis-data", "name": "coriolis-data",
"version": "2.4.3", "version": "2.5.0",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/EDCD/coriolis-data" "url": "https://github.com/EDCD/coriolis-data"