Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2a20285 1e6e35e)

commit	80787633cc4538cf353a80a81e8bbf05e8c9526b
author	Dan Poltawski <dan@moodle.com>
	Mon, 7 Apr 2014 05:10:41 +0000 (7 13:10 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Mon, 7 Apr 2014 05:10:41 +0000 (7 13:10 +0800)
tree	855785da37ddc78000aa9810ff47aa3dbe48747f	tree \| snapshot (tar.gz zip)
parent	2a20285c35b3ea9614075233924ebef3fda4a012	commit \| diff
parent	1e6e35e27793ff4fb6b966b4eb6c2145fbaf4a92	commit \| diff

Merge branch 'wip-MDL-33486-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

mod/wiki/pagelib.php	diff1 \|	diff2 \|	blob \| history
mod/wiki/renderer.php	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS