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
..
backup	git admin	2021-04-26 13:06:11 +02:00
cache	git admin	2021-04-26 13:06:11 +02:00
config	Merge branch 'develop' of https://oldperl@gitport.de/ConLite/ConLite.git into develop	2021-04-26 13:33:24 +02:00
cronlog	remove cronjob files and add gitignore	2020-02-19 22:01:57 +01:00
logs	re add pluginmanager	2020-02-19 21:58:47 +01:00
temp	git admin	2021-04-26 13:06:11 +02:00