Commit graph

4 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 bbb87c92f4 git admin 2021-04-26 13:12:50 +02:00
o.pinke c342abfef4 git admin 2021-04-22 13:14:37 +02:00
o.pinke 851e64a777 git admin 2020-07-24 19:33:41 +02:00