Official Moodle git projects - moodle.git/commit

projects / moodle.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7eae2c5 91d284c)

author	Aparup Banerjee <aparup@moodle.com>
	Tue, 13 Sep 2011 08:06:21 +0000 (16:06 +0800)
committer	Aparup Banerjee <aparup@moodle.com>
	Tue, 13 Sep 2011 08:06:21 +0000 (16:06 +0800)
commit	d1e362405e617ea95ae65cccba33e92e4380b777
tree	ea95a58c4c2dd506e9ffbc3be0c97a5715d22169	tree \| snapshot
parent	7eae2c5ae2d2001fef660d7a5101f356f8472231	commit \| diff
parent	91d284c1450f4a07519bc12257ba04e987de95ff	commit \| diff

Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated

17 files changed:

admin/registration/forms.php	diff1 \|	diff2 \|	blob \| history
backup/util/ui/renderer.php	diff1 \|	diff2 \|	blob \| history
blog/lib.php	diff1 \|	diff2 \|	blob \| history
blog/rsslib.php	diff1 \|	diff2 \|	blob \| history
course/delete.php	diff1 \|	diff2 \|	blob \| history
course/lib.php	diff1 \|	diff2 \|	blob \| history
course/report/completion/index.php	diff1 \|	diff2 \|	blob \| history
enrol/authorize/localfuncs.php	diff1 \|	diff2 \|	blob \| history
enrol/authorize/uploadcsv.php	diff1 \|	diff2 \|	blob \| history
enrol/flatfile/lib.php	diff1 \|	diff2 \|	blob \| history
enrol/paypal/ipn.php	diff1 \|	diff2 \|	blob \| history
lib/navigationlib.php	diff1 \|	diff2 \|	blob \| history
mod/feedback/mapcourse.php	diff1 \|	diff2 \|	blob \| history
notes/index.php	diff1 \|	diff2 \|	blob \| history
tag/coursetags_more.php	diff1 \|	diff2 \|	blob \| history
user/lib.php	diff1 \|	diff2 \|	blob \| history
user/view.php	diff1 \|	diff2 \|	blob \| history

Moodle official production repository