Merge branch 'MDL-31110_loading_animation' of git://github.com/davosmith/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:02:30 +0000 (01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:02:30 +0000 (01:02 +0100)
1  2 
lib/form/filemanager.php

Simple merge