codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Michael Schmatz 2015-03-21 14:27:52 -04:00
commit 806d997135
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/locale/es-ES.coffee
View file

@ -463,7 +463,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
experimental: "Experimental" experimental: "Experimental"
python_blurb: "Simple pero poderoso." python_blurb: "Simple pero poderoso."
javascript_blurb: "El lenguaje de la web." javascript_blurb: "El lenguaje de la web."
coffeescript_blurb: "Sintaxsis de JavaScript mejorada." coffeescript_blurb: "Sintaxis de JavaScript mejorada."
clojure_blurb: "Un Lisp moderno." clojure_blurb: "Un Lisp moderno."
lua_blurb: "Lenguaje Script para Juegos." lua_blurb: "Lenguaje Script para Juegos."
io_blurb: "Simple pero oscuro." io_blurb: "Simple pero oscuro."

2
server_setup.coffee
View file

@ -131,7 +131,7 @@ setupTrailingSlashRemovingMiddleware = (app) ->
next() next()
exports.setupMiddleware = (app) -> exports.setupMiddleware = (app) ->
setupChinaRedirectMiddleware app #setupChinaRedirectMiddleware app
setupMiddlewareToSendOldBrowserWarningWhenPlayersViewLevelDirectly app setupMiddlewareToSendOldBrowserWarningWhenPlayersViewLevelDirectly app
setupExpressMiddleware app setupExpressMiddleware app
setupPassportMiddleware app setupPassportMiddleware app