Merge remote-tracking branch 'origin/29-добавить-софт-делиты-в-принте… · profcomff/print-api@4a3039f · GitHub

Commit

Merge remote-tracking branch 'origin/29-добавить-софт-делиты-в-принте…

Browse files

…р-1' into 29-добавить-софт-делиты-в-принтер-1

# Conflicts:
#	migrations/versions/120e06710249_add_is_deleted_field_to_unionmember_.py

Loading branch information

gitfresnel committed Oct 25, 2024

2 parents dae0028 + 5495e19 commit 4a3039f