Merge remote-tracking branch 'origin/develop' into develop · dlsc-software-consulting-gmbh/jfxcentral2@f8b62d3 · GitHub

Commit

Merge remote-tracking branch 'origin/develop' into develop

Browse files

# Conflicts:
#	mobile/src/main/resources/com/dlsc/jfxcentral2/mobile/components/people.png

Loading branch information

dlemmermann committed Sep 4, 2024

2 parents b25b14e + 85ab5f6 commit f8b62d3