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 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
This commit is contained in:
Sabe Jones
2015-11-09 16:24:17 -05:00
parent 164309e050 6b7a757459
commit eed4207c6d
182 changed files with 1709 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ router.get('/', i18n.getUserLanguage, locals, function(req, res) {
// -------- Static Pages --------
var pages = ['front', 'privacy', 'terms', 'api', 'features', 'videos', 'contact', 'plans', 'new-stuff', 'community-guidelines', 'old-news', 'press-kit', 'faq'];
var pages = ['front', 'privacy', 'terms', 'api', 'features', 'videos', 'contact', 'plans', 'new-stuff', 'community-guidelines', 'old-news', 'press-kit', 'faq', 'overview', 'apps'];
_.each(pages, function(name){
router.get('/static/' + name, i18n.getUserLanguage, locals, function(req, res) {