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

2017-04-22 13:59:37 +02:00 · 2017-04-22 13:59:37 +02:00 · 04ccae5a5e
parent 055fdceff9 91fc9f9a1e
commit 04ccae5a5e
1 changed files with 1 additions and 1 deletions
--- a/scripts/eressea/e2/init.lua
+++ b/scripts/eressea/e2/init.lua
@ -9,7 +9,7 @@ return {
    require('eressea.wedding'),
    require('eressea.embassy'),
    require('eressea.tunnels'),
--    require('eressea.ponnuki'),
+    require('eressea.ponnuki'),
    require('eressea.astral'),
 --    require('eressea.locales'),
    require('eressea.jsreport'),