Merge remote-tracking branch 'origin/devel' into devel

Browse source

...

This commit is contained in:

Gina Häußge 2015-09-28 13:02:38 +02:00

parent 0b4e590a5b 2411b4260e

commit f3e242d3a0

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

2

src/octoprint/static/css/octoprint.css

View file

File diff suppressed because one or more lines are too long