Eloy Lafuente (stronk7) 5c7d164ff4 Merge branch 'MDL-44902_LTI_Addtions' of https://github.com/moodlerooms/moodle
Conflicts:
	mod/lti/version.php
2014-06-02 16:33:39 +02:00
..