Commit graph

3 Commits

Autor SHA1 Nachricht Datum
o.pinke 0942f07f06 Merge branch 'develop' of https://oldperl@gitport.de/ConLite/ConLite.git into develop
Conflicts:
	.gitignore
	conlite/plugins/.gitignore
	data/config/.gitignore
2021-04-26 13:33:24 +02:00
o.pinke 3b0a89d5b4 git admin 2021-04-26 13:06:11 +02:00
o.pinke a13c1cac64 git admin 2021-04-22 13:19:40 +02:00