From: Tom Marble Date: Mon, 5 Jan 2015 17:47:37 +0000 (-0600) Subject: Update FOSDEM index, point to presentations X-Git-Url: http://info9.net/gitweb/?p=wiki.git;a=commitdiff_plain;h=1253dcc3f98e84eddda1d245923a83b7843b4718 Update FOSDEM index, point to presentations --- diff --git a/fosdem.mdwn b/fosdem.mdwn index 34d9bf4..c5f4c36 100644 --- a/fosdem.mdwn +++ b/fosdem.mdwn @@ -1,10 +1,14 @@ # FOSDEM +## FOSDEM 2015 + +* https://fosdem.org/2015/schedule/track/legal_and_policy_issues/ + ## FOSDEM 2014 * [[LegalIssuesDevRoom]] -## Archive from FOSDEM 2012 +## Archive from FOSDEM 2013 * [[Legal Issues DevRoom 2013 |/fosdem2013/LegalIssuesDevRoom]] diff --git a/index.mdwn b/index.mdwn index f35e542..8120f3f 100644 --- a/index.mdwn +++ b/index.mdwn @@ -3,6 +3,7 @@ Welcome to the Informatique Inc. wiki Pages: * The blog for [[tmarble]] + * Informatique, Inc. [presentations][presentations] * The wiki for [[FOSDEM|fosdem]] devrooms * Tips on setting up [[SecureMail]] on Windows * All wikis are supposed to have a [[SandBox]], so this one does too. @@ -11,3 +12,5 @@ Pages: ---- This wiki is powered by [[ikiwiki]]. + +[presentations]: https://info9.net/presentations/