Merge branch '3.0' into web-refactoring

This commit is contained in:
calzoneman 2015-11-02 21:07:50 -08:00
commit 5ead24e45e
7 changed files with 26 additions and 25 deletions

View file

@ -49,9 +49,6 @@ mixin us-general
p.text-danger Changing layouts may require refreshing to take effect.
mixin rcheckbox("us-no-channelcss", "Ignore Channel CSS")
mixin rcheckbox("us-no-channeljs", "Ignore Channel Javascript")
.col-sm-4
.col-sm-8
p#us-conninfo.text-info <strong>Connection Information: </strong>
.clear
mixin us-scripts