diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-09-06 14:22:56 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-09-06 14:22:56 +0200 |
commit | c096d23ae71ee63fcd014240695e07b5bb6f622c (patch) | |
tree | 9358c91f93d0e77481c971d4aabcd07518d6de4f | |
parent | cf72a81f15168467c8075d6c864c2d39a6582ef2 (diff) | |
parent | c1681ae590c21c8fa2a8562c8be103a6a5bfc2b1 (diff) | |
download | www-c096d23ae71ee63fcd014240695e07b5bb6f622c.tar.gz www-c096d23ae71ee63fcd014240695e07b5bb6f622c.zip |
Merge branch 'master' of git+ssh://gnunet.org/www
-rw-r--r-- | template/index.html.j2 | 2 | ||||
-rw-r--r-- | template/use.html.j2 | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/template/index.html.j2 b/template/index.html.j2 index 1366a1a6..52d6a252 100644 --- a/template/index.html.j2 +++ b/template/index.html.j2 | |||
@@ -187,7 +187,7 @@ | |||
187 | <p> | 187 | <p> |
188 | {% trans %} | 188 | {% trans %} |
189 | GNUnet is a self-organizing network and it | 189 | GNUnet is a self-organizing network and it |
190 | is <a class="link" href="http://www.gnu.org/philosophy/free-sw.html">free software</a> | 190 | is <a class="link" href="https://www.gnu.org/philosophy/free-sw.html">free software</a> |
191 | as in freedom. GNUnet puts you in control of your data. | 191 | as in freedom. GNUnet puts you in control of your data. |
192 | You determine which data to share with whom, and you're not | 192 | You determine which data to share with whom, and you're not |
193 | pressured to accept compromises. | 193 | pressured to accept compromises. |
diff --git a/template/use.html.j2 b/template/use.html.j2 index 75c7c52c..a049b2a5 100644 --- a/template/use.html.j2 +++ b/template/use.html.j2 | |||
@@ -217,6 +217,11 @@ | |||
217 | 217 | ||
218 | <section> | 218 | <section> |
219 | <h3><a name="groupchat" class="subnav-anchor"></a>{{ _("Chatting with a (simple) client") }}</h3> | 219 | <h3><a name="groupchat" class="subnav-anchor"></a>{{ _("Chatting with a (simple) client") }}</h3> |
220 | <div class="alert" style="background-color: #419edb;"> | ||
221 | <div class="alert-content"> | ||
222 | Notice: The groupchat code is not working with the actual GNUnet release atm! | ||
223 | </div> | ||
224 | </div> | ||
220 | <p> | 225 | <p> |
221 | To make chatting a tiny bit easier and prettier, we need to install and compile additional software. | 226 | To make chatting a tiny bit easier and prettier, we need to install and compile additional software. |
222 | If you join the chat mentioned below and no one is there, feel free to ping on | 227 | If you join the chat mentioned below and no one is there, feel free to ping on |