krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sabrecat/more-modals

Browse Source
This commit is contained in:
Sabe Jones
2015-11-03 14:29:23 -05:00
parent eaad27dfee 1fa15ba24a
commit 502e7f0af2
285 changed files with 9747 additions and 9362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/src/routes/pages.js
View File

@@ -3,9 +3,7 @@ var express = require('express');
var router = new express.Router();
var _ = require('lodash');
var locals = require('../middlewares/locals');
var user = require('../controllers/user');
var auth = require('../controllers/auth');
var i18n = require('../i18n');
var i18n = require('../libs/i18n');
// -------- App --------
router.get('/', i18n.getUserLanguage, locals, function(req, res) {