Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-12-28 13:55:25 -08:00
commit 283b9e13b5

View file

@ -86,11 +86,11 @@ module.exports = class CocoRouter extends Backbone.Router
'play-old': go('play/MainPlayView') # This used to be 'play'.
'play': go('play/CampaignView')
'play/:map': go('play/CampaignView')
'play/ladder/:levelID': go('ladder/LadderView')
'play/ladder': go('ladder/MainLadderView')
'play/level/:levelID': go('play/level/PlayLevelView')
'play/spectate/:levelID': go('play/SpectateView')
'play/:map': go('play/CampaignView')
'preview': go('HomeView')