Merge branch 'master' into production

2018-01-14 13:00:42 +01:00 · 2018-01-14 13:00:42 +01:00 · 0d89651219
parent 6f25179795 2aabb76ae0
commit 0d89651219
1 changed files with 1 additions and 0 deletions
--- a/django/didgeridoo/webshop/admin.py
+++ b/django/didgeridoo/webshop/admin.py
@ -25,6 +25,7 @@ class PictureAdmin(admin.ModelAdmin):
 class PictureInline(admin.StackedInline):
    model = Picture
    form = PictureForm
+    can_delete = False
    verbose_name_plural = 'pictures'