Dan Poltawski b7db7803bc Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle ...

Conflicts:
	lib/db/upgrade.php
	version.php

2012-07-24 14:07:26 +08:00

..

textarea

MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700

2012-06-18 02:37:00 +02:00

tinymce

Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle

2012-07-24 14:07:26 +08:00

index.html

Some cleanups

2003-11-02 07:19:07 +00:00