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

..

cli

MDL-36436 add simple svg hacking tool for icon designers

2012-11-20 13:00:53 +01:00

lang/en

…

layout

MDL-36048 Allow course formats to add course headers and footers

2012-11-10 15:39:01 +08:00

pix

MDL-33688 filemanager - display progress bars as files uploaded

2012-11-29 11:33:40 +00:00

style

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

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

config.php

MDL-36048 Allow course formats to add course headers and footers

2012-11-10 15:39:01 +08:00

version.php

MDL-36933 Bump everything to 2012112900

2012-11-30 03:30:09 +01:00