Jean-Marie Place 1af6f79da9 Merge branch 'master' into dyn_fields
# Conflicts:
#	app/scodoc/sco_placement.py
#	app/static/css/scodoc.css
#	app/templates/scodoc/forms/placement.html
#	tests/unit/test_abs_demijournee.py
#	tests/unit/test_formations.py
2021-09-24 10:29:24 +02:00
..
2021-09-19 06:19:11 +02:00