Merge branch 'master' into consent-mode

Browse Source

# Conflicts:
#	passbook/stages/consent/models.py

...

This commit is contained in:

Jens Langhammer 2020-07-20 18:56:38 +02:00

parent ffff69ada0 88029a4335

commit d33f0fb2cf

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

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

Diff Content Not Available