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

Conflicts:
	admin/index.php
	admin/renderer.php
	version.php

2012-06-04 19:25:58 +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-22504 Course drag and drop upload - experimental setting is now a checkbox

2012-05-21 10:03:55 +01:00

frontpage.php

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

2012-01-03 09:09:40 +13: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-26155 admin: Rebased, fixed conflicts, and fixed final admin string

2012-01-03 09:12:33 +13: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-29615 message: reversed the default for messagingallowemailoverride and added upgrade code so upgraded sites maintain consistent behaviour

2012-02-01 09:26:53 +07:00

top.php

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

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

users.php

Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git with conflict resolution

2012-01-04 10:50:20 +13:00