Eloy Lafuente (stronk7) 4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle ... Conflicts: lib/upgrade.txt		2013-03-26 23:04:48 +01:00
..
cli	MDL-37293 user progress_trace in enrol_database sync	2012-12-29 21:43:03 +01:00
db	MDL-37032 upgrade: define all the 2.4.0 points	2012-12-11 13:11:11 +01:00
lang/en	MDL-35701 fix inline docs	2012-09-30 14:36:39 +02:00
tests	MDL-37420 rework pg schema testing	2013-01-11 02:12:38 +01:00
lib.php	MDL-37742 simplify dirty one-space oracle hack	2013-03-24 13:43:18 +01:00
settings.php	MDL-38147 deprecated make_categories_list(), change usage to coursecat	2013-03-25 13:20:46 +11:00
version.php	MDL-36933 Bump everything to 2012112900	2012-11-30 03:30:09 +01:00