From: chrysn Date: Fri, 29 Apr 2016 10:16:14 +0000 (+0200) Subject: Merge branch 'master' of git.deb.at:debienna X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=89b65ac2ef87484f57be23648d96419ccc0be95c;hp=7f72d4736b1e553b4ad23958ebf80bcde53b074a;p=debienna.git Merge branch 'master' of git.deb.at:debienna --- diff --git a/minidebconf_vie2016/minutes/day0.mdwn b/minidebconf_vie2016/minutes/day0.mdwn index 7f1a6a6..aa5834a 100644 --- a/minidebconf_vie2016/minutes/day0.mdwn +++ b/minidebconf_vie2016/minutes/day0.mdwn @@ -7,6 +7,8 @@ * A first video workshop took place to show how to use the video equipment correctly (thanks to tumbleweed, olasd and ivodd) +* [Futurezone](http://futurezone.at/digital-life/linuxwochen-wien-von-pong-und-fairphone-bis-zu-debian/195.803.802) visited our booth. + * The hacklab at fourth floor was set up and used throughout the day. * After the venue closed, we went to the [Metalab](https://metalab.at/) diff --git a/minidebconf_vie2016/press/index.mdwn b/minidebconf_vie2016/press/index.mdwn index 2f3be0a..a609d64 100644 --- a/minidebconf_vie2016/press/index.mdwn +++ b/minidebconf_vie2016/press/index.mdwn @@ -5,3 +5,5 @@ * [Ankündigung auf pro-linux.de](http://www.pro-linux.de/kalender/2/3523/minidebconf-vienna-2016.html) * [Ankündigung des Hamradio Talks beim Österreichischer Versuchssenderverband](http://www.oevsv.at/oevsv/veranstaltungen/Vortrag-Debian-Hams-and-Software-Defined-Radio-SDR/) * [Ankündigung in Daniel Pococks Blog](http://danielpocock.com/linuxwochen-minidebconf-vienna-2016) +* [Bericht der Futurezone](http://futurezone.at/digital-life/linuxwochen-wien-von-pong-und-fairphone-bis-zu-debian/195.803.802) +