Sam Hemelryk f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle ...

Conflicts:
	user/view.php

2013-01-09 09:34:22 +13:00

..

formats/leap2a

MDL-36841 portfolio: ensure variables in parent function match those of childs to prevent strict standard error

2012-11-27 14:12:25 +08:00

caller.php

MDL-30989 portfolio: Fixed up phpdocs

2012-02-15 15:33:06 +13:00

constants.php

MDL-30989 portfolio: updated portfolio phpdocs.

2012-01-30 15:37:46 +08:00

exceptions.php

MDL-30989 portfolio: Fixed up phpdocs

2012-02-15 15:33:06 +13:00

exporter.php

MDL-36357 cleanup - remove double semicolons

2012-11-15 09:51:26 +08:00

formats.php

MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons

2012-05-21 16:01:04 +08:00

forms.php

MDL-33552 - portfolio api E_STRICT fixes

2012-06-12 22:56:42 +08:00

plugin.php

MDL-33552 - portfolio api E_STRICT fixes

2012-06-12 22:56:42 +08:00