diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -54,7 +54,7 @@ branching model, but with some modificat Description of the branches: - **default**: This is the stable branch. -- **stable**: This is the main development branch. +- **dev**: This is the main development branch. - **hotfix-***: These branches branch off from the default branch and are used to fix bugs which are in the stable version. They will be merged back into *default* and *dev*. After the bug is fixed, the *PATCH* number must be 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 @@ -111,63 +111,63 @@

Bitcoin Address: 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC

- -
- -
- -
- + + +
+ +
+ +
-
-
- -
- - +
+ +
+ + +
-
- -
- -
- + +
+ +
+ +
@@ -176,24 +176,28 @@

PayPal high fees

-

Use your existing PayPal account or check-out as guest. (Credit cards accepted)

-
- - - - -
-
+
+

Use your existing PayPal account or check-out as guest. (Credit cards accepted)

+
+ + + + +
+
+

Flattr

-

Flattr us!

- - Flattr this - +
+

Flattr us!

+ + Flattr this + +
@@ -201,8 +205,8 @@

BPM Points

-

For our parcel station and international mail boxes.

+

For our parcel station and international mail boxes.

Send your BPM voucher code to:
: info@enn.lu GPG: 0x02225522 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 @@ -49,22 +49,21 @@
: info@enn.lu GPG: 0x02225522
: enn.lu/ or {{ config['ENNSTATUS_ONION_ADDRESS'] }}
- : +352-691-71-77-44
- : +352-20-21-18-60 + : {{ config['ENNSTATUS_PHONE_NUMBER'] }}

Abuse

For further details about abuse handling, have a look over here.

: abuse@enn.lu GPG: 0x02225522
- : +352-691-71-77-44
+ : {{ config['ENNSTATUS_PHONE_NUMBER'] }}

Press

Press related inqueries should go to:

: press@enn.lu GPG: 0x02225522
- : +352-691-71-77-44
+ : {{ config['ENNSTATUS_PHONE_NUMBER'] }}
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.3.0-dev', + version='5.3.1-dev', description=('Ennstatus provides the user with vital information about ' 'the status of the organizations Tor servers.'), author='Frënn vun der Ënn',