From: elgekko <vasary@elgekko.net>
Date: Mon, 15 May 2023 20:13:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=1721143d3b12216b847ad1ead8c421a4f41b2e72;p=sly-crm.git

Merge remote-tracking branch 'origin/master'

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

1721143d3b12216b847ad1ead8c421a4f41b2e72