Damyon Wiese 1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle ...

Conflicts:
	lib/tests/moodlelib_test.php
	version.php

2013-02-11 14:51:11 +08:00

..

lang/en

MDL-36602 support mnethostid in user csv upload tool

2013-01-19 13:27:00 +01:00

index.php

Merge branch 'master_MDL-35332' of git://github.com/totara/moodle

2013-02-11 14:51:11 +08:00

locallib.php

MDL-34455 Libraries: Replaced deprecated get_context_instance()

2012-07-23 14:33:02 +08:00

picture_form.php

MDL-29029 move user upload to admin tools

2011-09-18 11:00:39 +02:00

picture.php

MDL-34455 Libraries: Replaced deprecated get_context_instance()

2012-07-23 14:33:02 +08:00

settings.php

MDL-29029 move user upload to admin tools

2011-09-18 11:00:39 +02:00

user_form.php

MDL-32945 libraries: Replaced deprecated PARAM_MULTILANG with PARAM_TEXT

2012-07-19 15:44:40 +08:00

version.php

MDL-36602 support mnethostid in user csv upload tool

2013-01-19 13:27:00 +01:00