Eloy Lafuente (stronk7) e780e5cb8f Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges
Conflicts:
	lib/db/upgrade.php
	version.php
2013-07-16 01:29:01 +02:00
..