Merge branch 'master' into '173-substitutions-empty-teacher-drop-down'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -27,6 +27,7 @@ Fixed
 * Lessons weren't shown as cancelled on teacher or room timetables
   if events had replaced them.
 * The teacher dropdown in the substitution edit form did not contain suggestions.
+* The URLs containing the term "substitution" were missspelled.
 
 `2.3`_ - 2022-03-21
 -------------------

aleksis/apps/chronos/urls.py

@@ -34,12 +34,12 @@ urlpatterns = [
         name="lessons_day_by_date",
     ),
     path(
-        "lessons/<int:id_>/<int:week>/substition/",
+        "lessons/<int:id_>/<int:week>/substitution/",
         views.edit_substitution,
         name="edit_substitution",
     ),
     path(
-        "lessons/<int:id_>/<int:week>/substition/delete/",
+        "lessons/<int:id_>/<int:week>/substitution/delete/",
         views.delete_substitution,
         name="delete_substitution",
     ),