diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2019-10-23 18:00:09 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2019-10-23 18:00:09 +0200 |
| commit | bba70d9df06854539f7fb2e61f5ca000331fd7f6 (patch) | |
| tree | ecb05a07a7b3f8cb6aca9525d6a2a4e54a684b00 /index.mdwn | |
| parent | 9e427f42d96564596b3ddad234639ffa40d6d241 (diff) | |
| parent | 61917d3b3aa363befea8b525248502f82e9a1420 (diff) | |
Merge branch 'master' into aktiv-test
Conflicts:
.ikiwiki/IkiWiki/Plugin/pandoc.pm
Diffstat (limited to 'index.mdwn')
| -rw-r--r-- | index.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -60,7 +60,7 @@ aktivitetsdagar: e-post, kontakter, etc. från t.ex. Google till Fripost. * [[Exodus]] -- Flerstegsprogram för att gå ur Facebook -Utredningear +Utredningar ------------ Med jämna mellanrum ges utredningsuppdrag från styrelsen till |