Gina Häußge
|
76b4a45495
|
Merge branch 'maintenance' into devel
Conflicts:
THIRDPARTYLICENSES.md
setup.py
src/octoprint/server/__init__.py
src/octoprint/server/views.py
src/octoprint/settings.py
src/octoprint/static/css/octoprint.css
|
2016-05-03 10:48:26 +02:00 |
|
Gina Häußge
|
652158d17a
|
WIP: Announcement plugin
|
2016-05-02 10:12:17 +02:00 |
|
Gina Häußge
|
e0b888b2d0
|
First throw at an "About" dialog
(cherry picked from commit f2c07e8)
|
2016-04-19 16:41:30 +02:00 |
|
Gina Häußge
|
c44920c0f7
|
Updated used third party libraries & licenses
|
2016-01-11 16:46:36 +01:00 |
|
Gina Häußge
|
f2c07e8f96
|
First throw at an "About" dialog
|
2015-09-03 17:08:15 +02:00 |
|