Commit graph

7 commits

Author SHA1 Message Date
Gina Häußge
604c2a0bdd Some small bugfixes in the plugin handling code and a changelog entry 2014-09-14 14:41:18 +02:00
Gina Häußge
1c19bb4dfc Merge branch 'master' into devel
Conflicts:
	CHANGELOG.md
2014-09-13 22:01:12 +02:00
Gina Häußge
858d87a732 Forgot entry in changelog 2014-09-13 21:58:41 +02:00
Gina Häußge
85c170712a Some more entries into the Changelog, trying to get up to date... 2014-09-04 08:30:36 +02:00
Gina Häußge
33bf487a1c i18n: Added dutch and norwegian translations 2014-09-03 18:59:50 +02:00
Gina Häußge
227810db75 Merge branch 'master' into devel
Conflicts:
	src/octoprint/events.py
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
	src/octoprint/templates/index.jinja2
2014-09-03 18:55:59 +02:00
Gina Häußge
6171c76199 Renamed RELEASE-NOTES.md to CHANGELOG.md, added note regarding new version format 2014-09-03 11:30:00 +02:00
Renamed from RELEASE-NOTES.md (Browse further)