Lucas Hinderberger a20230f555 Merge branch 'resolve-merge-conflict'		2020-10-16 17:36:13 +02:00
..
docs-contributor-faq.md	Fixed error spotted by @n	2020-10-16 17:15:05 +02:00
index.md	Merge branch 'resolve-merge-conflict'	2020-10-16 17:36:13 +02:00