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

..

db

MDL-30964 fix phpdocs in access.php files in all plugins

2012-02-27 07:23:10 +01:00

lang/en

MDL-29030 standardise report_security

2011-11-06 12:22:46 +01:00

index.php

MDL-29904-master FIX to add pagelayout=>report

2011-11-20 18:58:49 +00:00

locallib.php

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

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

settings.php

MDL-29030 standardise report_security

2011-11-06 12:22:46 +01:00

version.php

MDL-36933 Bump everything to 2012112900

2012-11-30 03:30:09 +01:00