Dan Poltawski 5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle ... Conflicts: admin/tool/monitor/version.php mod/lesson/version.php		2014-11-05 12:11:16 +00:00
..
lang/en	MDL-30007 standardise data field subplugin lang files	2011-11-30 03:46:08 +01:00
field.class.php	MDL-46500 mod_data: Removing duplicate filemanager initialisations	2014-10-30 16:10:15 +08:00
mod.html	MDL-39077 max_files does not include current option when it is non-standard	2013-05-01 12:40:57 +01:00
version.php	MDL-48021 bump: Bump all versions to planned release	2014-11-04 17:52:35 +01:00