Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2017-04-22 13:59:37 +02:00
commit 04ccae5a5e
1 changed files with 1 additions and 1 deletions

View File

@ -9,7 +9,7 @@ return {
require('eressea.wedding'), require('eressea.wedding'),
require('eressea.embassy'), require('eressea.embassy'),
require('eressea.tunnels'), require('eressea.tunnels'),
-- require('eressea.ponnuki'), require('eressea.ponnuki'),
require('eressea.astral'), require('eressea.astral'),
-- require('eressea.locales'), -- require('eressea.locales'),
require('eressea.jsreport'), require('eressea.jsreport'),