Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:33:58 +0000 (00:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:33:58 +0000 (00:33 +0200)
commita9b1af901b1acf032b9daa1c7b79b225a11f544b
tree7e49b7f9b7c511ec515375a9d506b1382ef9da7d
parent8c7840df32c10903d2651bd4a770081786780097
parent0d7c4171756d05b4f3519b280e2beda5bd157f86
Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle