[wiki] [sites] Add slcon2 e.V. and next location vote videos || FRIGN

From: <git_AT_suckless.org>
Date: Thu, 14 Apr 2016 11:20:15 +0200

commit 1d6359104c1d0e996f3c7564e2bde6f2255d94d5
Author: FRIGN <dev_AT_frign.de>
Date: Thu Apr 14 11:15:40 2016 +0200

    Add slcon2 e.V. and next location vote videos
    
    Those you have all been waiting for! :D

diff --git a/suckless.org/conference/2015.md b/suckless.org/conference/2015.md
index 30f3a16..74026e8 100644
--- a/suckless.org/conference/2015.md
+++ b/suckless.org/conference/2015.md
_AT_@ -73,6 +73,12 @@ Talks
> Anselm presented the idea of suckless.org e.V.[¹][1] and asked
   attendees to join.
 
+<video width="600" height="338" controls="" style="display:block;margin:0 auto" poster="http://dl.sta.li/slcon/2015/slcon-2015-05-all-suckless_ev.png">
+ <source src="http://dl.sta.li/slcon/2015/slcon-2015-05-all-suckless_ev.webm" type="video/webm">
+ <a href="http://dl.sta.li/slcon/2015/slcon-2015-05-all-suckless_ev.webm">slcon-2015-05-all-suckless_ev.webm</a>
+</video>
+
+
 (16:30-17:30) *suckless.org foundation*, All
 
 (17:30-19:00) Refresh break / check your rooms
_AT_@ -148,6 +154,15 @@ Talks
 
 (14:45-15:00) *Formal conference talk closing*, Anselm R Garbe
 
+> Anselm formally closed the conference and it was decided upon the location
+ for the upcoming slcon3.
+
+<video width="600" height="338" controls="" style="display:block;margin:0 auto" poster="http://dl.sta.li/slcon/2015/slcon-2015-10-all-vote.png">
+ <source src="http://dl.sta.li/slcon/2015/slcon-2015-10-all-vote.webm" type="video/webm">
+ <a href="http://dl.sta.li/slcon/2015/slcon-2015-10-all-vote.webm">slcon-2015-10-all-vote.webm</a>
+</video>
+
+
 (15:00-17:00) Hacking
 
 (17:00-) Social event in Budapest
Received on Thu Apr 14 2016 - 11:20:15 CEST