merge and fixed conflict

2 files changed, 13 insertions, 0 deletions

diff --git a/src/web/templates/about.html b/src/web/templates/about.html
index c2d0ae4d..70ae0a5f 100644
--- a/src/web/templates/about.html
+++ b/src/web/templates/about.html
@@ -12,6 +12,7 @@
         redistribute the <a href="https://github.com/newspipe/newspipe">source code</a>
         according to the <a href="https://www.gnu.org/licenses/agpl-3.0.html">Affero GPL</a> license.') }}</p>
         <p>{{ _('Found a bug? Report it <a href="https://github.com/newspipe/newspipe/issues">here</a>.') }}</p>
+        <p><a href="{{ url_for('about_more') }}">More information</a> about this instance.</p>
     </div>
     <div class="well">
         <h1>{{ _('Help') }}</h1>
diff --git a/src/web/templates/about_more.html b/src/web/templates/about_more.html
new file mode 100644
index 00000000..dd7088a5
--- /dev/null
+++ b/src/web/templates/about_more.html
@@ -0,0 +1,12 @@
+{% extends "layout.html" %}
+{% block content %}
+<div class="container">
+    <ul class="list-group">
+        <li class="list-group-item">Newspipe version: <a href="https://github.com/newspipe/newspipe/releases/tag/{{newspipe_version}}">{{newspipe_version}}</a></li>
+        <li class="list-group-item">Running on Heroku: {{on_heroku}}</li>
+        <li class="list-group-item">Registration: {{registration}}</li>
+        <li class="list-group-item">Python version: {{python_version}}</li>
+        <li class="list-group-item">Number of users: {{nb_users}}</li>
+    </ul>
+</div><!-- /.container -->
+{% endblock %}