Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Thorium-Sim/thorium into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Anderson committed Jun 23, 2020
2 parents 13274d0 + 9e6c60b commit bfd09b3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [2.12.2](https://github.com/Thorium-Sim/thorium/compare/2.12.1...2.12.2) (2020-06-19)


### Bug Fixes

* **Server:** Fixes an issue where the server couldn't start. Closes [#2983](https://github.com/Thorium-Sim/thorium/issues/2983) ([cf367d5](https://github.com/Thorium-Sim/thorium/commit/cf367d572796c61b02599978a4671e658ac8f2ae))

## [2.12.1](https://github.com/Thorium-Sim/thorium/compare/2.12.0...2.12.1) (2020-06-17)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thorium",
"version": "2.12.1",
"version": "2.12.2",
"description": "Starship Simulator Controls",
"private": true,
"repository": {
Expand Down

0 comments on commit bfd09b3

Please sign in to comment.