Gina Häußge edf83e4984 Merge branch 'vanilla_devel' of https://github.com/mrbeam/OctoPrint into pr/mrbeam/vanilla_devel ... Conflicts: src/octoprint/static/less/octoprint.less		2016-08-15 09:40:21 +02:00
..
bootstrap	Lots of changes:	2014-01-05 11:23:44 +01:00
font-awesome.less	Upgraded Font Awesome and introduced new file list	2014-04-28 22:11:56 +02:00
mixins.less	New transparent toggle in appearance settings	2015-02-28 23:43:30 +01:00
octoprint.less	Merge branch 'vanilla_devel' of https://github.com/mrbeam/OctoPrint into pr/mrbeam/vanilla_devel	2016-08-15 09:40:21 +02:00
variables.less	Lots of changes:	2014-01-05 11:23:44 +01:00