David Monllao d4a41aa252 Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle ...

Conflicts:
	admin/tool/cohortroles/settings.php

2016-04-29 12:19:39 +01:00

..

cli

…

mnet

…

registration

…

roles

…

settings

Merge branch 'MDL-51603-dataformat' of https://github.com/brendanheywood/moodle

2016-04-20 12:37:05 +08:00

tests/behat

…

tool

Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle

2016-04-29 12:19:39 +01:00

user

MDL-34925 user: Convert bulk user download to dataformat

2016-04-20 13:02:06 +10:00

webservice

MDL-49414 webservices: Remove deprecated functions

2016-04-27 15:54:38 +08:00

antiviruses.php

…

auth_config.php

…

auth.php

…

blocks.php

…

category.php

…

courseformats.php

…

cron.php

…

dataformats.php

MDL-51603 dataformat: Implement streaming dataformat plugin

2016-04-20 12:39:25 +10:00

editors.php

…

enrol.php

…

environment.php

…

environment.xml

MDL-51603 dataformat: Implement streaming dataformat plugin

2016-04-20 12:39:25 +10:00

filters.php

…

index.php

…

lib.php

…

licenses.php

…

localplugins.php

…

mailout-debugger.php

…

message.php

…

modules.php

…

oauth2callback.php

…

phpinfo.php

…

plagiarism.php

…

plugins.php

…

portfolio.php

…

process_email.php

…

purgecaches.php

…

qbehaviours.php

…

qtypes.php

…

renderer.php

…

reports.php

…

repository.php

…

repositoryinstance.php

…

resetemoticons.php

…

search.php

…

settings.php

…

thirdpartylibs.php

…

timezone.php

…

tools.php

…

upgradesettings.php

…

user.php

…