diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2018-03-31 10:18:30 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2018-03-31 10:18:30 +0200 |
| commit | a0cfb02fdaffc070c974e2fa27e86d3abc4522a2 (patch) | |
| tree | 488ca650064b82cbf867d6595f54ced3f8b9ff97 /website/om.mdwn | |
| parent | 7ba626f979b3978563aebad41c27954bbb4e40b2 (diff) | |
| parent | d0a5d3daa9a56e69bd31a0e3e708963ba1d4cad6 (diff) | |
Merge branch 'master' into meeting-list
Conflicts:
moten.mdwn
Diffstat (limited to 'website/om.mdwn')
| -rw-r--r-- | website/om.mdwn | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/website/om.mdwn b/website/om.mdwn index ee33131..78d90ef 100644 --- a/website/om.mdwn +++ b/website/om.mdwn @@ -97,5 +97,3 @@ Vår [hemsida](https://fripost.org) och Se [medlemssidan](/medlemskap) för mer information om hur du kan gå med i Fripost. - - |