Eloy Lafuente (stronk7) 8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle ...

Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php

2011-11-11 03:37:55 +01:00

..

backups

…

completion

Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle

2011-11-11 03:37:55 +01:00

configlog

…

courseoverview

…

log

Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

2011-11-10 10:15:50 +13:00

loglive

…

outline

…

participation

Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

2011-11-10 10:15:50 +13:00

progress

Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle

2011-11-11 03:37:55 +01:00

questioninstances

…

security

…

stats

…

upgrade.txt

…