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)
commit037546ae1f11334cb0805793811e66a78ed7b02d
tree272c64c61f6eb34db88484a4531cde1718cc138c
parent615812040aabe79483bbb2507efd42634b624163
parent7e7b5afac6082286a9325034dd3bf686f7bc4ddd
Merge branch 'MDL-48205_master' of https://github.com/totara/openbadges
badges/criteria/award_criteria_activity.php