Merge branch 'release'

This commit is contained in:
jonpas 2017-12-20 21:01:46 +01:00
commit 77be185c30
4 changed files with 10 additions and 10 deletions

View File

@ -4,7 +4,7 @@
<p align="center">
<a href="https://github.com/acemod/ACE3/releases/latest">
<img src="https://img.shields.io/badge/Version-3.11.0-blue.svg?style=flat-square" alt="ACE3 Version">
<img src="https://img.shields.io/badge/Version-3.12.0-blue.svg?style=flat-square" alt="ACE3 Version">
</a>
<a href="https://github.com/acemod/ACE3/issues">
<img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

View File

@ -1,4 +1,4 @@
#define MAJOR 3
#define MINOR 12
#define PATCHLVL 0
#define BUILD 28
#define BUILD 29

View File

@ -8,17 +8,17 @@ ace:
githubUrl: https://github.com/acemod/ACE3
version:
major: 3
minor: 11
minor: 12
patch: 0
build: 26
build: 29
acex:
githubUrl: https://github.com/acemod/ACEX
version:
major: 3
minor: 2
minor: 3
patch: 0
build: 4
build: 6
markdown: kramdown

View File

@ -10,17 +10,17 @@ ace:
githubUrl: https://github.com/acemod/ACE3
version:
major: 3
minor: 11
minor: 12
patch: 0
build: 26
build: 29
acex:
githubUrl: https://github.com/acemod/ACEX
version:
major: 3
minor: 2
minor: 3
patch: 0
build: 4
build: 6
markdown: kramdown