David Monllao ceb7769a29 Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle ...

Conflicts:
	theme/bootstrapbase/style/moodle.css

2014-12-17 11:48:42 +08:00

..

base

Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle

2014-12-16 10:44:16 +00:00

bootstrapbase

Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle

2014-12-17 11:48:42 +08:00

canvas

Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle

2014-11-25 18:38:24 +01:00

clean

MDL-48023 Files API: Theme files must be cache-able by shared proxies.

2014-11-16 09:53:27 +01:00

more

MDL-48023 Files API: Theme files must be cache-able by shared proxies.

2014-11-16 09:53:27 +01:00

font.php

Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle

2014-04-01 10:37:22 +08:00

image.php

…

index.php

…

javascript.php

MDL-46775: Fix call to unavailable function when loading an invalid JS file

2014-08-12 14:06:37 +12:00

jquery.php

…

styles_debug.php

MDL-44357 theme: Chunk content in styles_debug for IE

2014-03-24 15:15:03 +08:00

styles.php

MDL-45084 theme: File was not chunked on IE

2014-04-14 16:25:20 +08:00

switchdevice.php

…

upgrade.txt

Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle

2014-12-16 18:52:40 +00:00

yui_combo.php

…

yui_image.php

…