Merge pull request #196 from GaaH/use-logo-in-groups

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

Tue, 9 Mar 2021 06:25:35 +0000 (22:25 -0800)

committer GitHub <noreply@github.com>

Tue, 9 Mar 2021 06:25:35 +0000 (22:25 -0800)
author Bastien Wirtz <bastien.wirtz@gmail.com>
Tue, 9 Mar 2021 06:25:35 +0000 (22:25 -0800)
committer GitHub <noreply@github.com>
Tue, 9 Mar 2021 06:25:35 +0000 (22:25 -0800)
diff --cc docs/configuration.md
Simple merge
diff --cc src/App.vue
Simple merge
author	Bastien Wirtz <bastien.wirtz@gmail.com>
	Tue, 9 Mar 2021 06:25:35 +0000 (22:25 -0800)
committer	GitHub <noreply@github.com>
	Tue, 9 Mar 2021 06:25:35 +0000 (22:25 -0800)
		1	2
docs/configuration.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/App.vue	patch \|	diff1 \|	diff2 \|	blob \| history