[www] branch master updated (834f154 -> 818e50a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository www.

    from 834f154  update text
     new dee0c8c  ignore .core
     new 3a521e8  Merge branch 'master' of gnunet.org:www
     new 65f835a  Merge branch 'master' of gnunet.org:www
     new 60614bd  Merge branch 'master' of gnunet.org:www
     new 818e50a  @ html

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                       | 2 ++
 news/2019-11-ICANNUpdate.html.j2 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ffeeaad..f5d1cb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ sitemap.html
 futility_engine_loader.sh
 
 config.mk
+
+*.core
diff --git a/news/2019-11-ICANNUpdate.html.j2 b/news/2019-11-ICANNUpdate.html.j2
index 47bcf2f..3606ff0 100644
--- a/news/2019-11-ICANNUpdate.html.j2
+++ b/news/2019-11-ICANNUpdate.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1>GNS@ICANN66</h1>
+  <h1>GNS&#64;ICANN66</h1>
 <p>
   The <a href="https://meetings.icann.org/en/montreal66";>ICANN Annual General 
Meeting</a> is concluded. We were invited to join a panel discussion on 
<i>Emerging Internet Identifier Technologies</i> in order to share our ideas 
and work on the <i>GNU Name System (GNS)</i>. You can find the presentation on 
GNS in <a href="{{ url_localized('video.html') }}">our video section</a>. The 
handshake.org project, which proposes a decentralized, blockchain-based 
governance of the root zone (as oppo [...]
 </p>

-- 
To stop receiving notification emails like this one, please contact
address@hidden.