Merge branch 'MDL-48205_master' of https://github.com/totara/openbadges
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Apr 2015 12:20:48 +0000 (14:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Apr 2015 12:20:48 +0000 (14:20 +0200)
1  2 
badges/criteria/award_criteria_activity.php