arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-16 04:59:23 +00:00
Code Issues Releases Wiki Activity
6,002 Commits 8 Branches 109 Tags 19 MiB
fe7299323c
Commit Graph

2 Commits

Author SHA1 Message Date
Christian König
12674c0824
Shorten no merge conflict message 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-22 22:27:03 +01:00
Christian König
7562376373
Add merge-conflict workflow 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-17 21:14:20 +01:00