-
Conflicts: course/edit_form.php lib/db/install.xml lib/form/dateselector.php lib/form/datetimeselector.php lib/setup.php
6dd59aab
Conflicts: course/edit_form.php lib/db/install.xml lib/form/dateselector.php lib/form/datetimeselector.php lib/setup.php