aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormu <mu@m.m>2019-06-27 01:03:51 +0200
committermu <mu@m.m>2019-06-27 01:03:51 +0200
commitf7b572a3ea19b297750757f18feef6f455045a08 (patch)
tree088714d6d3c260a27672a87efa182f1c7730caac
parenta1a27e9ba448d022a59db821d5c03f75fe577c41 (diff)
parent21d00e0e6254d6d43225d15f2a43fb965c2c29b9 (diff)
downloadwww-f7b572a3ea19b297750757f18feef6f455045a08.tar.gz
www-f7b572a3ea19b297750757f18feef6f455045a08.zip
Merge branch 'master' of ssh://git.gnunet.org/www
-rw-r--r--template/engage.html.j228
-rw-r--r--template/tutorial-debian9.html.j26
-rw-r--r--template/tutorial-ubuntu1804.html.j25
3 files changed, 20 insertions, 19 deletions
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 0fb2f1e3..bf9edf48 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -97,30 +97,26 @@
97 We meet in meatspace occasionally, mostly in Germany and Switzerland. The usual occasions are: 97 We meet in meatspace occasionally, mostly in Germany and Switzerland. The usual occasions are:
98 <ul> 98 <ul>
99 <li><a href="https://events.ccc.de/congress">Chaos Communication Congress</a> in Leipzig (DE), 27th-30th December</li> 99 <li><a href="https://events.ccc.de/congress">Chaos Communication Congress</a> in Leipzig (DE), 27th-30th December</li>
100 <li><a href="https://datenspuren.de">Datenspuren</a> in Dresden (DE), usually end of September</li> 100 <li><a href="https://datenspuren.de">Datenspuren</a> in Dresden (DE), usually by mid/end of September</li>
101 <li>GNUnet Hackweek in Mont-Soleil (CH), usually end of June</li> 101 <li>GNUnet Hackweek in Mont-Soleil (CH), usually by the end of June</li>
102 <li>Other meetings happening throughout the year: You’ll get to know about it on our Mailinglist (or propose them yourself).</li> 102 <li>Other meetings happening throughout the year: You’ll get to know about it on our Mailinglist (or propose them yourself).</li>
103 </ul> 103 </ul>
104 </p> 104 </p>
105 </div> 105 </div>
106 </div>
107 </div> 106 </div>
108 107
108 <!-- TEMPLATE
109 109
110<!-- UNTEN LINKS ^ --> 110 <div class="row">
111 111 <div class="col-lg-5">
112 <div class="row"> 112 </div>
113 <div class="col-lg-5"> 113 <!-- UNTEN LINKS ^ -->
114 114 <div class="col-lg-5 offset-md-1">
115 115 </div>
116 116 <!-- UNTEN RECHTS ^ -->
117<!-- UNTEN RECHTS ^ --> 117 </div>
118
119 <div class="col-lg-5 offset-md-1">
120
121
122
123 118
119 -->
124 120
125 </div> 121 </div>
126 </article> 122 </article>
diff --git a/template/tutorial-debian9.html.j2 b/template/tutorial-debian9.html.j2
index e4ca0db2..74bf7f57 100644
--- a/template/tutorial-debian9.html.j2
+++ b/template/tutorial-debian9.html.j2
@@ -34,7 +34,11 @@
34 </p> 34 </p>
35 35
36 <code> 36 <code>
37 $ sudo apt install git libtool autoconf autopoint build-essential libgcrypt-dev libidn11-dev zlib1g-dev libunistring-dev libglpk-dev miniupnpc libextractor-dev libjansson-dev libcurl4-gnutls-dev libsqlite3-dev openssl libnss3-tools 37 $ sudo apt install git libtool autoconf autopoint \<br>
38 build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br>
39 libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br>
40 libjansson-dev libcurl4-gnutls-dev gnutls-bin libsqlite3-dev \<br>
41 openssl libnss3-tools libopus-dev libpulse-dev libogg-dev
38 </code> 42 </code>
39 43
40 <h3>{{ _("Make an installation directory") }}</h3> 44 <h3>{{ _("Make an installation directory") }}</h3>
diff --git a/template/tutorial-ubuntu1804.html.j2 b/template/tutorial-ubuntu1804.html.j2
index cee663d2..32d4dc91 100644
--- a/template/tutorial-ubuntu1804.html.j2
+++ b/template/tutorial-ubuntu1804.html.j2
@@ -35,8 +35,9 @@
35 $ sudo apt install git libtool autoconf autopoint \<br> 35 $ sudo apt install git libtool autoconf autopoint \<br>
36 build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br> 36 build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br>
37 libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br> 37 libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br>
38 libjansson-dev libcurl4-gnutls-dev libsqlite3-dev openssl \<br> 38 libjansson-dev libcurl4-gnutls-dev gnutls-bin libsqlite3-dev \<br>
39 libnss3-tools libmicrohttpd-dev 39 openssl libnss3-tools libmicrohttpd-dev libopus-dev libpulse-dev \<br>
40 libogg-dev
40 </code> 41 </code>
41</section> 42</section>
42<section> 43<section>