Merge branch 'master' into production

This commit is contained in:
Nick Winter 2016-02-02 17:14:32 -08:00
commit 692d8ec917

View file

@ -273,7 +273,7 @@ nav.navbar.navbar-default
li li
a(href="https://sites.google.com/a/codecombat.com/teacher-guides/") Educator Wiki a(href="https://sites.google.com/a/codecombat.com/teacher-guides/") Educator Wiki
li li
a(href="/courses/quote") Request a Quote a(href="/teachers/quote") Request a Quote
.col-sm-3 .col-sm-3
ul.list-unstyled ul.list-unstyled