Dan Poltawski 3d891e3263 Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle ...

Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js

2014-12-04 12:04:07 +00:00

..

classes

…

condition

…

tests

…

yui

Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle

2014-12-04 12:04:07 +00:00

renderer.php

…

upgrade.txt

…