[MERGE] forward port branch saas-11.3 up to 4850fb0838

2018-09-07 14:43:48 +02:00
parent b4c72220c7 4850fb0838
commit 49c3264ce0
98 changed files with 1417 additions and 343 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');
        },