Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: fbb4c95 33b24bd)

commit	7b06151288072f0b9e6f02af5935ca54add0aa30
author	Sam Hemelryk <sam@moodle.com>
	Wed, 16 May 2012 22:55:35 +0000 (17 10:55 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Wed, 16 May 2012 22:55:35 +0000 (17 10:55 +1200)
tree	fe3ea5cf1ee493637e8b07ebf7abbb3527adec14	tree \| snapshot (tar.gz zip)
parent	fbb4c959b5f3fed091052fecdab50bd73f7a8fd5	commit \| diff
parent	33b24bdd9998239fedf0b156ec7bb7312e8df5da	commit \| diff

Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle

Conflicts:
course/lib.php
theme/base/style/course.css

course/lib.php	diff1 \|	diff2 \|	blob \| history
course/view.php	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
lang/en/moodle.php	diff1 \|	diff2 \|	blob \| history
mod/folder/lib.php	diff1 \|	diff2 \|	blob \| history
mod/page/lib.php	diff1 \|	diff2 \|	blob \| history
mod/resource/lib.php	diff1 \|	diff2 \|	blob \| history
mod/url/lib.php	diff1 \|	diff2 \|	blob \| history
theme/base/style/course.css	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS