Merge branch '0.12.31_update' into dt_develop

# Conflicts:
#	Dockerfile
#	README.md
This commit is contained in:
David Andersen
2016-04-26 14:44:56 -07:00
2 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,7 @@
# Supported tags and respective `Dockerfile` links
* `0.12.30`, `latest` [(0.12.30/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/Dockerfile)
* `0.12.31`, `latest` [(0.12.31/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/dt_develop/Dockerfile)
* `0.12.30` [(0.12.30/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/dt_develop/Dockerfile)
[![](https://badge.imagelayers.io/dtandersen/factorio:latest.svg)](https://imagelayers.io/?images=dtandersen/factorio:latest 'Get your own badge on imagelayers.io')