Commit 400dbc91 authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Merge branch 'hotfix/non_atomic_migration' into 'master'

The newsletter migration can't be run atomically

See merge request !346
parents 023d8cb3 e5607879
......@@ -69,6 +69,7 @@ def migrate_content_to_item(apps, schema_editor):
class Migration(migrations.Migration):
atomic = False
dependencies = [
('newsletters', '0005_merge_20161214_2018'),
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment