Merge remote-tracking branch 'origin/develop' into feature/220_backend · OnroerendErfgoed/crabpy_pyramid@d040a0b · GitHub

Commit

Merge remote-tracking branch 'origin/develop' into feature/220_backend

Browse files

# Conflicts:
#	.travis.yml
#	crabpy_pyramid/tests/renderers/test_capakey.py
#	crabpy_pyramid/tests/test_capakey.py
#	crabpy_pyramid/tests/test_utils.py
#	tests/__init__.py

Loading branch information

Tim Van Campenhout committed Nov 25, 2024

2 parents 661189d + a32faae commit d040a0b