]> git.g-eek.se Git - inbyggd-frihet-wiki.git/commit
Merge remote-tracking branch 'origin/master'
authorIkiWiki <ikiwiki.info>
Sun, 10 Mar 2019 15:53:15 +0000 (16:53 +0100)
committerIkiWiki <ikiwiki.info>
Sun, 10 Mar 2019 15:53:15 +0000 (16:53 +0100)
commit4a24ff4971ffcf25bda81bf87a7a67b30784d2ff
treeb19898fad69ccef5ab8a5472bab4fd3cefdbe691
parent85d29ebb35e367db267e45d842fda40caadb7b01
parent4517eee83eb8c6efd8084f4c790cb18409a5bc6f
Merge remote-tracking branch 'origin/master'

 Conflicts:
guider.mdwn
konfigurationer.mdwn
träffar.mdwn

This was part in a cleaning up session
guider.mdwn
index.mdwn
konfigurationer.mdwn
träffar.mdwn