1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-16 12:37:58 +02:00
Commit Graph

2 Commits

Author SHA1 Message Date
Christian König
a4b5122e3e
Shorten no merge conflict message
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-22 22:29:09 +01:00
Christian König
e734f1fbce
Add merge conflict workflow
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:54:27 +01:00