# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2016-05-30 22:09:09
# Node ID 2e6cd1aea609e6c388cf1bd8b7125dea4797a926
# Parent  3fac0ac71ac45be7fdcb0324c6c4c506017b3325
# Parent  bb77fe08d174ed7d2b4132e9e2e2120fd298c284

Merged dev

diff --git a/ennstatus/templates/donate/index.html b/ennstatus/templates/donate/index.html
--- a/ennstatus/templates/donate/index.html
+++ b/ennstatus/templates/donate/index.html
@@ -84,10 +84,12 @@
         </center>
         <div class="well well-sm">
            <address>
-            <strong>Frënn vun der Ënn, ASBL</strong><br>
-                    {{ config['ENNSTATUS_ADDRESS'] }}<br>
+             <strong>Frënn vun der Ënn, ASBL</strong><br>
+                    {{ config['ENNSTATUS_ADRESS_CO'] }}<br>
+                    {{ config['ENNSTATUS_HOUSE_NAME'] }}<br>
+                    {{ config['ENNSTATUS_STREET'] }}<br>
                     {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>
-                    {{ config['ENNSTATUS_COUNTRY'] }}
+                    {{ config['ENNSTATUS_COUNTRY'] }}<br>{{ config['ENNSTATUS_CONTINENT'] }}
           </address>
         </div>
       </div>
diff --git a/ennstatus/templates/root/contact.html b/ennstatus/templates/root/contact.html
--- a/ennstatus/templates/root/contact.html
+++ b/ennstatus/templates/root/contact.html
@@ -31,9 +31,11 @@
     <p>Please mail all general inquiries to:</p>
     <address>
       <strong>Frënn vun der Ënn, ASBL</strong><br>
-        {{ config['ENNSTATUS_ADDRESS'] }}<br>
+        {{ config['ENNSTATUS_ADDRESS_CO'] }}<br>
+        {{ config['ENNSTATUS_HOUSE_NAME'] }}<br>
+        {{ config['ENNSTATUS_STREET'] }}<br>
         {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>
-        {{ config['ENNSTATUS_COUNTRY'] }}<br>
+        {{ config['ENNSTATUS_COUNTRY'] }}<br>, {{ config['ENNSTATUS_CONTINENT'] }}
         <br>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
       <abbr title="Website"><span class="glyphicon glyphicon-cloud"></span></abbr> : <a href="//enn.lu/">enn.lu/</a> <strong>or</strong> <a href="//{{ config['ENNSTATUS_ONION_ADDRESS'] }}/" target="_blank">{{ config['ENNSTATUS_ONION_ADDRESS'] }}</a><br>
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ def _get_requirements():
 
 
 setup(name='Ennstatus',
-      version='5.5.0',
+      version='5.6.0',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',