uon merge conflict fixes
authorJoseph Baxter <joseph.baxter@nottingham.ac.uk>
Mon, 21 Jul 2014 09:06:46 +0000 (10:06 +0100)
committerJoseph Baxter <joseph.baxter@nottingham.ac.uk>
Mon, 21 Jul 2014 09:06:46 +0000 (10:06 +0100)
commitf9c3a3640e187aa576b4a2fc882aa42f92732412
tree4121482c675922f1fd5e9b89dc4bddf12a981baf
parent86c7a10c35aa80b81cb2169e9ace0b634cd986f3
uon merge conflict fixes
18 files changed:
add_form.php
attendance.php [new file with mode: 0644]
backup/moodle2/backup_attendance_activity_task.class.php
backup/moodle2/restore_attendance_activity_task.class.php
db/install.xml
db/upgrade.php
export.php
export_form.php
lang/en/attendance.php [changed mode: 0755->0644]
locallib.php
renderables.php
renderer.php [changed mode: 0755->0644]
report.php
sessions.php
student_attenance_form.php [new file with mode: 0644]
tests/behat/attendance_mod.feature [new file with mode: 0644]
tests/behat/behat_mod_attendance.php [new file with mode: 0644]
version.php