Damyon Wiese f2f23af955 Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle ... Conflicts: theme/bootstrapbase/style/moodle.css		2013-11-14 17:18:44 +08:00
..
db	MDL-30610 remove outdated filter upgrade code	2011-12-23 10:38:11 +01:00
lang/en	MDL-29992 filters - new filter/glossary filter replacement for legacy mod/glossary/filter.	2011-10-29 17:50:58 +02:00
tests	MDL-34654 Glossary: ampersand breaks auto-linking	2013-10-25 18:15:03 +01:00
yui	MDLSITE-2493 glossary filter alert dialog button string now translatable	2013-11-08 16:33:10 +08:00
filter.php	Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle	2013-11-14 17:18:44 +08:00
styles.css	MDL-29992 filters - move related css from mod/glossary to filter/glossary	2011-10-29 19:02:22 +02:00
version.php	MDL-42701 Bump all versions near 2.6 release	2013-11-05 02:36:00 +01:00