https://git.useribm.hu
/
sly-crm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc40813
d02c79b
)
Merge remote-tracking branch 'origin/master'
author
elgekko
<vasary@elgekko.net>
Mon, 15 May 2023 20:13:48 +0000
(22:13 +0200)
committer
elgekko
<vasary@elgekko.net>
Mon, 15 May 2023 20:13:48 +0000
(22:13 +0200)
# Conflicts:
# lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
1
2
lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lis-services/src/main/java/hu/user/lis/services/data/ProjectServiceImpl.java
Simple merge
https://git.useribm.hu / sly-crm.git / commitdiff