Merge branch 'reverse-proxy' into develop

This commit is contained in:
Mark McDowall 2014-01-06 17:17:16 -08:00
commit 16356b6319
22 changed files with 168 additions and 93 deletions

View file

@ -232,7 +232,7 @@ define(
});
app.addInitializer(function () {
Backbone.history.start({ pushState: true });
Backbone.history.start({ pushState: true, root: serverStatusModel.get('urlBase') });
RouteBinder.bind();
AppLayout.navbarRegion.show(new NavbarView());
$('body').addClass('started');