summaryrefslogtreecommitdiffstats
path: root/index.mdwn
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem.moulin@fripost.org>2012-03-31 14:25:09 +0200
committerGuilhem Moulin <guilhem.moulin@fripost.org>2012-03-31 14:25:09 +0200
commit25805ef534b1aa74dd1319266ccc5b2ddf44aaa8 (patch)
tree7bc0ceb9d198c0ee82d75f5d267c388f2ccb7cad /index.mdwn
parentf360a1410c6f152a4b10b20dbe733b72e714b75c (diff)
parent5c39f18ff2c369533d8c219f250127780fc0456c (diff)
Merge branch 'master' of git.fripost.org:fripost-wiki
Diffstat (limited to 'index.mdwn')
-rw-r--r--index.mdwn1
1 files changed, 1 insertions, 0 deletions
diff --git a/index.mdwn b/index.mdwn
index c993e99..cd5ca4a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,6 +4,7 @@ Välkommen till Friposts medlemswiki!
# Föreningen
+* [[Friposts Vårfest 2012|fest_2012_04_21]]
* [[Möten|Moten]] - Dagordningar, protokoll, kommande möten m.m.
* [[Medlemsrekrytering]] - hur man hjälper till
* [[Hjälpa till|Hjalpa_till]] - olika idéer och projekt