Commit 708a698d authored by Adam Gausmann's avatar Adam Gausmann

Merge branch 'masterfix' into 'master'

Masterfix

Fixes some issues encountered by previous 1.1.2 release being merged in with 1.2 changes.

See merge request !18
parents 24791ddb b14a8dd1
Pipeline #5443316 passed with stages
in 41 seconds
......@@ -5,7 +5,7 @@
<parent>
<artifactId>samurai</artifactId>
<groupId>ninja.nonemu</groupId>
<version>1.1.2</version>
<version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<groupId>ninja.nonemu</groupId>
<artifactId>samurai</artifactId>
<version>1.1.2</version>
<version>1.2-SNAPSHOT</version>
<modules>
<module>api</module>
<module>runtime</module>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>samurai</artifactId>
<groupId>ninja.nonemu</groupId>
<version>1.1.2</version>
<version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment