[www] branch stable updated (a576211 -> c04ac57)

[gnunet]

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

martin-schanzenbach pushed a change to branch stable
in repository www.

    from a576211  fix link
     add 1869271  change to track git factory default (master)
     add e58ac25  Merge branch 'master' of gnunet.org:www
     add 4e8ff3d  add fosdem video
     add c04ac57  fix link to slides

No new revisions were added by this update.

Summary of changes:
 .gitmodules |  1 -
 www.yml     | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 1cb3512..e15461d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,4 @@
 [submodule "inc"]
        path = inc
        url = https://git.gnunet.org/www_shared.git
-       branch = default
         ignore = dirty
diff --git a/www.yml b/www.yml
index cd544fa..960a4eb 100644
--- a/www.yml
+++ b/www.yml
@@ -173,6 +173,20 @@ newsposts:
 # <!-- FIXME 2013: no media link. <li>Roger Dingledine and Jacob Appelbaum, "Q 
&amp; A", Technische Universität München (<a 
href="https://archive.org/details/RogerDingledineAndJacobAppelbaumQAMarathon"; 
download>download</a>)</li> -->
 # <!-- FIXME 2013: no source link on web. <li>Maximilian Szengel, <a 
href="">"Decentralized Evaluation of Regular Expressions for Capability 
Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li> -->
 videoslist:
+  - year: 2020
+    authors:
+      - "Martin Schanzenbach"
+    location: "FOSDEM20"
+    description: "GNUnet presented at the Decentralized Internet and Privacy 
devroom at FOSDEM20 in 2020."
+    name: "GNUnet at FOSDEM20"
+    sources:
+      - 
"https://git.gnunet.org/gnunet-videos-2020.git/plain/FOSDEM20/dip_gnunet.webm";
+    mirror_sources:
+      - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.webm";
+      - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.mp4";
+    slides:
+      - 
"https://git.gnunet.org/presentations.git/plain/fosdem20/20200202_fosdem20_gnunet.pdf";
+    comment:
   - year: 2019
     authors:
       - "Martin Schanzenbach"

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