Merge branch 'site-select' into welcome

This commit is contained in:
Franz Pletz
2015-10-04 17:05:04 +02:00
7 changed files with 299 additions and 5 deletions

1
extra/ffmuc_welcome.conf Symbolic link
View File

@@ -0,0 +1 @@
../site.conf