Merge remote-tracking branch 'refs/remotes/origin/master'

[wiki.git] / fosdem.mdwn

diff --git a/fosdem.mdwn b/fosdem.mdwn
index 34d9bf4ae52122243d3852f41e02503b93306291..c4e5c029f2636f8c91dd9f6ebbf05840cfbd8641 100644 (file)
--- a/fosdem.mdwn
+++ b/fosdem.mdwn
@@ -1,10 +1,14 @@
 # FOSDEM
 
+## FOSDEM 2015
+
+* [Legal and Policy Issues devroom 2015][devroom2015]
+
 ## FOSDEM 2014
 
 * [[LegalIssuesDevRoom]]
 
-## Archive from FOSDEM 2012
+## Archive from FOSDEM 2013
 
 * [[Legal Issues DevRoom 2013 |/fosdem2013/LegalIssuesDevRoom]]
 
@@ -14,3 +18,5 @@
 * [[Free Java DevRoom 2012 |/fosdem2012/FreeJavaDevRoom]]
 
 [[!tag fosdem]]
+
+[devroom2015]: https://fosdem.org/2015/schedule/track/legal_and_policy_issues/