Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 032bfca b849c21)

commit	8ac9d33f492f41897ac561c0eb92daf6a9b5d7e7
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Fri, 11 Nov 2011 02:37:55 +0000 (11 03:37 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Fri, 11 Nov 2011 02:37:55 +0000 (11 03:37 +0100)
tree	1f85321447ee0592d5ebc7053a9589654d6e1f9a	tree \| snapshot (tar.gz zip)
parent	032bfca82a871266a620046e7eb0b799856e4ee8	commit \| diff
parent	b849c21255ddab171eca5ff25f9b0731829da2d1	commit \| diff

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

lang/en/admin.php	diff1 \|	diff2 \|	blob \| history
lib/db/upgrade.php	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	diff1 \|	diff2 \|	blob \| history
mod/assignment/lib.php	diff1 \|	diff2 \|	blob \| history
mod/forum/lib.php	diff1 \|	diff2 \|	blob \| history
mod/scorm/report/basic/report.php	diff1 \|	diff2 \|	blob \| history
report/completion/index.php	diff1 \|	\|	blob \| history
report/progress/index.php	diff1 \|	\|	blob \| history
theme/base/style/core.css	diff1 \|	diff2 \|	blob \| history
version.php	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS