Merge conflicts solve

pull/1240/head
Simon 4 years ago committed by GitHub
parent 6c2b12d7bf
commit 8732101938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -92,4 +92,4 @@ Verq (Verq#2338) - https://github.com/CordlessCoder
LukaHietala (Pix.#0001) - https://github.com/LukaHietala
Freebiell (Freebie#3263) - https://github.com/FreebieII
Freebiell (Freebie#6429) - https://github.com/FreebieII

Loading…
Cancel
Save