summaryrefslogtreecommitdiff
path: root/workshop_app/apps.py
diff options
context:
space:
mode:
authorpnshiralkar2020-05-28 11:33:46 +0530
committerpnshiralkar2020-05-28 11:33:46 +0530
commit9bd1b23ea038be5abde8e22260ef7563c6beff35 (patch)
treeeebf4b7aa0f3637143988331715c774164f70555 /workshop_app/apps.py
parente5f9cf202659ef01984c4726b31bf44ee70b2563 (diff)
parent8396869fd7750742e4910b9fe0f8a7683a6769ab (diff)
downloadworkshop_booking-9bd1b23ea038be5abde8e22260ef7563c6beff35.tar.gz
workshop_booking-9bd1b23ea038be5abde8e22260ef7563c6beff35.tar.bz2
workshop_booking-9bd1b23ea038be5abde8e22260ef7563c6beff35.zip
Solved merge conflicts
Diffstat (limited to 'workshop_app/apps.py')
0 files changed, 0 insertions, 0 deletions