Merge branch 'marietje-zuid' into 'dsprenkels/remove_executed'

Browse Source

# Conflicts:
#   marietje/playerapi/views.py

...

This commit is contained in:

Daan Sprenkels

2019-03-20 11:15:03 +01:00

parent 0b1dfaf020 6fed97f62c

commit 6d568851d3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available