[MERGE] forward port branch 11.0 up to 213759b03e

2018-09-05 18:52:27 +02:00
parent 7700bd172f 213759b03e
commit f19e6ce561
81 changed files with 918 additions and 269 deletions
@@ -446,7 +446,7 @@ of them in the new class.
        },
    };

-    var Hamster = Hamster.extend(DanceMixin, {
+    var Hamster = Animal.extend(DanceMixin, {
        sleep: function () {
            console.log('sleeping');
        },