From: chrysn <chrysn@fsfe.org>
Date: Fri, 29 Apr 2016 07:28:32 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/?p=debienna.git;a=commitdiff_plain;h=682cf1242d2df3aa595164f4b98cb4a43c3ea761;hp=-c

Merge branch 'master' of git.deb.at:debienna
---

682cf1242d2df3aa595164f4b98cb4a43c3ea761
diff --combined minidebconf_vie2016/index.mdwn
index 275f9cc,04715f9..a36278d
--- a/minidebconf_vie2016/index.mdwn
+++ b/minidebconf_vie2016/index.mdwn
@@@ -17,7 -17,7 +17,7 @@@ exchange ideas
    as a part of [Linuxwochen Wien](http://linuxwochen.at/)
  
  * Location (online): [#debian.or.at at oftc.net](irc://irc.debian.org/debian.or.at),
 -  video streams yet to be announced.
 +  video streams yet to be announced<!-- at http://video.debconf.org:8000/minidebconf.ogv (in case of trouble, contact #debian-video on irc) -->.
  
  * Schedule:
  
@@@ -30,6 -30,9 +30,9 @@@
      [on Saturday around 12:00 in room F0.02](https://cfp.linuxwochen.at/de/LWW16/public/schedule/2),
      and continue on [Sunday from 10:00 to 16:00](https://cfp.linuxwochen.at/de/LWW16/public/schedule/3).
  
+ * Minutes:
+   * [[Day 0|minutes/day0]]
+ 
  Registration
  ------------