Merge remote-tracking branch 'origin/master'
authorelgekko <vasary@elgekko.net>
Mon, 15 May 2023 20:13:48 +0000 (22:13 +0200)
committerelgekko <vasary@elgekko.net>
Mon, 15 May 2023 20:13:48 +0000 (22:13 +0200)
commit1721143d3b12216b847ad1ead8c421a4f41b2e72
treebd0bacb2bedb7ebf6e11af59da832bc5463dac2a
parentbc40813552d9700a93bfc1fca3e56e1bb1b31640
parentd02c79b0bf07f0c96643b6d8af94be0d3def7089
Merge remote-tracking branch 'origin/master'

# Conflicts:
# lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java