return to previous merge

notemyprogress/ajax.php

notemyprogress/amd/build/helpdialog.min.js

notemyprogress/amd/build/helpdialog.min.js.map

notemyprogress/amd/build/metareflexion.js

notemyprogress/amd/build/pageheader.min.js

notemyprogress/amd/build/pageheader.min.js.map

notemyprogress/amd/build/setweeks.js

notemyprogress/amd/build/student_planning.js

notemyprogress/amd/src/helpdialog.js

notemyprogress/amd/src/pageheader.js

notemyprogress/assignments.php

notemyprogress/classes/configweeks.php

notemyprogress/classes/email.php

notemyprogress/classes/lib_trait.php

notemyprogress/classes/metareflexion.php

notemyprogress/classes/report.php

notemyprogress/classes/student.php

notemyprogress/classes/student_planning.php

notemyprogress/classes/teacher.php

notemyprogress/db/install.php