Commit 899d3401 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'revert-97db6566' into 'master'

Revert "Merge branch 'fix/members-migration' into 'master'"

This reverts merge request !108

Ik heb natuurlijk weer veel te snel !108 geaccepteerd. @twiggers had gelijk: het is geen probleem - in `0010_merge_20160907_2042.py` wordt `0007_member_receive_newsletter` gewoon gemerged.

See merge request !109
parents 97db6566 0bda7916
......@@ -9,7 +9,6 @@ class Migration(migrations.Migration):
dependencies = [
('members', '0007_auto_20160901_2159'),
('members', '0007_member_receive_newsletter'),
]
operations = [
......
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