pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maintenance' into devel

Browse source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Gina Häußge 2016-11-30 14:34:21 +01:00
commit 4541148aa5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -163,7 +163,7 @@
([Commits](https://github.com/foosel/OctoPrint/compare/1.2.16...1.3.0rc1))
## 1.2.18rc1 (2016-11-22)
## 1.2.18 (2016-11-30)
### Improvements
@ -179,7 +179,11 @@
* [#1571](https://github.com/foosel/OctoPrint/issues/1571) - Fix parsing of port number from HTTP Host header for IPv6 addresses
* Fix issue with settings restriction causing internal settings defaults to be changed.
([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17...1.2.18))
### More information
* [Commits](https://github.com/foosel/OctoPrint/compare/1.2.17...1.2.18)
* Release Candidates:
* [1.2.18rc1](https://github.com/foosel/OctoPrint/releases/tag/1.2.18rc1)
## 1.2.17 (2016-11-08)