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
..
2013-03-22 13:09:50 +01:00