make-ing cfacbe2610 Merge branch 'stable-1.2.2' into mrbeam-multipass ... Conflicts: src/octoprint/static/js/app/viewmodels/printerstate.js src/octoprint/util/comm_acc2.py		2016-03-18 13:38:05 +01:00
..
css	Show overlay when a new server version is detected	2015-06-21 18:02:16 +02:00
font	Upgraded Font Awesome and introduced new file list	2014-04-28 22:11:56 +02:00
gcodeviewer	Merge remote-tracking branch 'upstream/maintenance' into upstream_merge	2015-07-02 22:36:30 +02:00
img	Merge remote-tracking branch 'upstream/maintenance' into upstream_merge	2015-07-02 22:36:30 +02:00
js	Merge branch 'stable-1.2.2' into mrbeam-multipass	2016-03-18 13:38:05 +01:00
less	Merge remote-tracking branch 'upstream/maintenance' into upstream_merge	2015-07-02 22:36:30 +02:00
empty	Webassets are now written to ~/.octoprint/generated	2015-06-03 18:27:30 +02:00
robots.txt	Moved octoprint sources to "src" folder, adjusted setup.py and run script accordingly	2013-09-15 21:45:33 +02:00