Damyon Wiese 13410584be Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle ...

Conflicts:
	filter/tex/version.php
	lang/en/admin.php

2013-12-03 09:26:58 +08:00

..

activitynames

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

algebra

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

censor

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

data

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

emailprotect

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

emoticon

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

glossary

Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle

2013-11-14 17:18:44 +08:00

mediaplugin

MDL-42930 Add 2.6.0 upgrade line

2013-11-18 11:47:17 +08:00

multilang

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

tex

Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle

2013-12-03 09:26:58 +08:00

tidy

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

urltolink

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

index.html

…

local_settings_form.php

MDL-29401 fix previous regression

2011-09-26 23:21:39 +02:00

manage.php

MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas

2013-10-21 14:17:55 +08:00

upgrade.txt

MDL-42243 fix filter settings regression and support standard settings.php

2013-10-12 13:38:34 +02:00