Merge remote-tracking branch 'origin/8079-display-log-files' into 807… · ita-social-projects/GreenCity@9731918 · GitHub

Commit

Merge remote-tracking branch 'origin/8079-display-log-files' into 807…

Browse files

…9-display-log-files

# Conflicts:
#	service/src/main/java/greencity/service/LogFileServiceImpl.java

Loading branch information

Warded120 committed Feb 24, 2025

2 parents 43ebaf3 + cceb682 commit 9731918