Skip to content

Commit

Permalink
Merge branch 'main' into job-add-info
Browse files Browse the repository at this point in the history 
# Conflicts:
#	florist/api/db/entities.py
#	florist/api/routes/server/job.py
#	florist/tests/integration/api/routes/server/test_job.py
  • Loading branch information
@lotif
lotif committed Apr 12, 2024
2 parents aca816a + 6281fd7 commit 37b0894
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 37b0894

Please sign in to comment.