Merge remote-tracking branch 'refs/remotes/origin/develop' into enhan… · dlsc-software-consulting-gmbh/jfxcentral2@d6bdf02 · GitHub

Commit

Merge remote-tracking branch 'refs/remotes/origin/develop' into enhan…

Browse files

…cement-people-image

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

Loading branch information

leewyatt committed Sep 3, 2024

2 parents 0810ffa + 85ab5f6 commit d6bdf02