merge of '387adb565814aa1d31385605b099239d2cecdbc4'

and '90e9ef1d0273dbc956caccfe46d907a27c28ca46'
2018-04-07 14:06:37 +00:00
parent 92b5b3c7aa 62f355b7fd
commit 9c519a87f0
33 changed files with 2155 additions and 730 deletions
--- a/i2p2www/templatevars.py
+++ b/i2p2www/templatevars.py
@ -23,6 +23,7 @@ I2P_TO_CLEAR = {
    'mail.i2p': 'i2pmail.org',
    'lists.i2p2.i2p': 'lists.i2p2.de',
    'i2p-javadocs.i2p': 'docs.i2p-projekt.de/javadoc', # Hacky to include the path, but it works!
+    'echelon.i2p/javadoc': 'docs.i2p-projekt.de/javadoc', # Hacky to include the path, but it works!
    'stats.i2p': 'stats.i2p', # Inproxy disabled at request of site owner
    'zzz.i2p': 'zzz.i2p',     # Inproxy disabled at request of site owner
    }