Dan Poltawski e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle ...

Conflicts:
	lib/db/upgrade.php
	version.php

2012-07-10 09:43:23 +08:00

..

appearance.php

Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle

2012-05-10 10:52:32 +08:00

courses.php

Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle

2012-05-02 13:55:39 +08:00

development.php

MDL-33715 css_optimiser: enablecssoptimiser setting now triggers theme_reset_all_caches when changed

2012-06-19 10:10:20 +12:00

frontpage.php

Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle

2012-07-10 09:43:23 +08:00

grades.php

MDL-31158 make grade recovery site-configurable

2012-02-17 09:25:24 +07:00

language.php

MDL-26155 admin: Converted admin settings to use new lang_string

2012-01-03 09:09:40 +13:00

location.php

MDL-26155 admin: Converted admin settings to use new lang_string

2012-01-03 09:09:40 +13:00

mnet.php

MDL-34175 a few more renamed admin fixes

2012-07-06 07:53:44 +02:00

plugins.php

MDL-29836 webservices: use individual string

2012-05-25 10:33:02 +08:00

security.php

MDL-19125 module restrictions: use a capability

2012-03-15 17:11:27 +00:00

server.php

Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle

2012-06-04 19:25:58 +08:00

subsystems.php

MDL-33597 css_optimiser: Moved the Enable CSS optimiser setting from advanced to experimental settings

2012-06-12 14:23:20 +12:00

top.php

Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle

2012-06-04 19:25:58 +08:00

users.php

MDL-8249 localise standard role names and descriptions if empty

2012-07-06 08:22:34 +02:00