Merge pull request #448 from bemble/main

author Bastien Wirtz <bastien.wirtz@gmail.com>

Sat, 4 Jun 2022 07:07:15 +0000 (09:07 +0200)

committer GitHub <noreply@github.com>

Sat, 4 Jun 2022 07:07:15 +0000 (09:07 +0200)
author Bastien Wirtz <bastien.wirtz@gmail.com>
Sat, 4 Jun 2022 07:07:15 +0000 (09:07 +0200)
committer GitHub <noreply@github.com>
Sat, 4 Jun 2022 07:07:15 +0000 (09:07 +0200)
diff --cc docs/configuration.md
Simple merge
diff --cc src/App.vue
Simple merge
author	Bastien Wirtz <bastien.wirtz@gmail.com>
	Sat, 4 Jun 2022 07:07:15 +0000 (09:07 +0200)
committer	GitHub <noreply@github.com>
	Sat, 4 Jun 2022 07:07:15 +0000 (09:07 +0200)
		1	2
docs/configuration.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/App.vue	patch \|	diff1 \|	diff2 \|	blob \| history