Dan Poltawski 19226a309f Merge branch 'MDL-39063' of github.com:totara/openbadges ...

Conflicts:
	admin/settings/badges.php
	lib/db/upgrade.php
	version.php

2013-04-16 12:00:46 +01:00

..

appearance.php

…

badges.php

Merge branch 'MDL-39063' of github.com:totara/openbadges

2013-04-16 12:00:46 +01:00

courses.php

…

development.php

…

frontpage.php

…

grades.php

…

language.php

…

location.php

…

mnet.php

…

plugins.php

…

security.php

…

server.php

…

subsystems.php

…

top.php

…

users.php

…