rebase from mnml mistakes source

2023-12-03 18:05:58 +01:00
parent 5863542848
commit e9ce85de29
52 changed files with 857 additions and 1781 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -4,7 +4,7 @@ assets/js/lunr/*                linguist-vendored
 assets/js/plugins/*             linguist-vendored
 assets/js/vendor/*              linguist-vendored
 _sass/minimal-mistakes/vendor/* linguist-vendored
-CHANGELOG.md                    text merge=ours
-docs/_docs/18-history.md        text merge=ours
-
+CHANGELOG.md                    merge=ours
+docs                            merge=ours
+_posts                          merge=ours
 *.md                            text