Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 18784ad 8d29a8c)

commit	322d9c8cdafccbd5143ff6ac0abc3664d2e3815f
author	Sam Hemelryk <sam@moodle.com>
	Thu, 26 Sep 2013 23:32:05 +0000 (27 11:32 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Thu, 26 Sep 2013 23:32:05 +0000 (27 11:32 +1200)
tree	9306e48715614338e1613f3bb5be82b5256d0780	tree \| snapshot (tar.gz zip)
parent	18784adb1263c3496d23527a6db8d1d4249c7ffe	commit \| diff
parent	8d29a8c3bc9dea0c28e0b5ed842afe7f06eb393b	commit \| diff

Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

Conflicts:
mod/scorm/db/upgrade.php

Read-only mirror of the Moodle CVS