Merge branch 'develop' into feature/add-dockerfile

DaneEveritt · web-flow · commit fefcc310d4b9 · 2018-09-18T21:40:30.000-07:00
diff --git a/public/themes/pterodactyl/css/terminal.css b/public/themes/pterodactyl/css/terminal.css
@@ -26,7 +26,6 @@
 
 #terminal > .cmd {
     padding: 1px 0;
-    white-space: pre;
 }
 
 #terminal_input {
