From: IkiWiki <ikiwiki.info>
Date: Sun, 10 Jan 2021 09:21:12 +0000 (+0200)
Subject: Merge git://effi.branchable.com
X-Git-Url: http://vikisorsa.effi.org/?p=.git;a=commitdiff_plain;h=fc263c1e98a4a43a706232483e0b3cfe9aa4be77

Merge git://effi.branchable.com

Vanha wiki branchablesta
---

fc263c1e98a4a43a706232483e0b3cfe9aa4be77