Dan Poltawski 0f94289c1d Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle ...

Conflicts:
	files/renderer.php
	lib/outputrenderers.php

2013-01-16 11:18:18 +08:00

..

coursefilesedit_form.php

MDL-28666 Extends repository to support references

2012-05-21 11:57:51 +08:00

coursefilesedit.php

…

externallib.php

MDL-34549 libraries: Replace get_context_instance_by_id() by context::instance_by_id()

2012-08-24 11:30:10 +08:00

index.php

…

renderer.php

Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle

2013-01-16 11:18:18 +08:00