o.pinke 12e58c78ef Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # .idea/php.xml # .idea/vcs.xml		2023-10-16 18:02:31 +02:00
..
.gitignore	gitadmin	2023-07-04 16:37:19 +02:00
dataSources.xml	ide conf	2023-10-12 15:18:03 +02:00
php.xml	cleanup README.md	2023-10-12 14:44:25 +02:00
phpunit.xml	settings	2023-10-11 17:13:28 +02:00
vcs.xml	settings	2023-10-11 17:13:28 +02:00
workspace.xml	gitadmin	2023-04-26 14:52:05 +02:00