Lukasz Lenart d8090ef9d8 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04 ...

# Conflicts:
#	Jenkinsfile
#	bundles/admin/src/main/resources/osgi/admin/shell.ftl
#	bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
#	bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl
#	plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java

2024-01-04 10:21:52 +01:00

..

workflows

Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04

2024-01-04 10:21:52 +01:00

dependabot.yml

Adds missing Dependabot config

2023-07-17 19:50:56 +02:00