Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
1  2 
lib/amd/build/form-autocomplete.min.js
lib/amd/src/form-autocomplete.js
lib/upgrade.txt

index 9e44334,dedccb7..fb06114
Binary files differ
Simple merge
diff --cc lib/upgrade.txt
Simple merge