diff --git a/CHANGELOG.md b/CHANGELOG.md index 164442dd..a74e02f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,8 @@ by versioneer * [#679](https://github.com/foosel/OctoPrint/issues/679) - Fix error where API state is requested and printer is offline (backport of [619fe9a](https://github.com/foosel/OctoPrint/commit/619fe9a0e78826bd1524b235a910156439bcb6d7)). -* [IRC] - Don't hiccup on slic3r filament_diameter comments generated for multi extruder setups -* [ML] - Fixed relative URL to sockjs endpoint, wasn't yet using the proper base url +* [IRC] - Don't hiccup on slic3r ``filament_diameter`` comments generated for multi extruder setups +* [ML] - Fixed relative URL to SockJS endpoint, wasn't yet using the proper base url * [unreported] & [#698](https://github.com/foosel/OctoPrint/issues/698) - Generated URLs now take X-Forwarded-Host header sent by proxies into account for included host and port, also fixed [#698](https://github.com/foosel/OctoPrint/issues/698) introduced by this @@ -27,6 +27,8 @@ - [unreported] Synchronize image counter decrementing as well as incrementing to prevent rare race conditions when generating the image file names +([Commits](https://github.com/foosel/OctoPrint/compare/1.1.1...master)) + ## 1.1.1 (2014-10-27) ### Improvements