David Monllao 3dd89357d4 Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle ...

Conflicts:
	lib/upgrade.txt

2016-04-14 14:01:16 +08:00

..

behat

MDL-16855 tags: allow to filter tags on management page

2016-04-11 10:04:17 +08:00

events_test.php

MDL-50851 core_tag: introduce tag collections

2016-01-10 15:25:43 +08:00

external_test.php

MDL-53772 inplace_editable: set context in callbacks

2016-04-14 13:58:29 +08:00

taglib_test.php

MDL-52707 core_tag: allow to combine tags

2016-04-11 09:49:56 +08:00