Fix conflicts

This commit is contained in:
Quentin Guidée
2020-02-17 17:10:32 +01:00
109 changed files with 340 additions and 82 deletions

View File

@@ -80,6 +80,7 @@ void MenuController::didBecomeFirstResponder() {
}
void MenuController::viewWillAppear() {
ViewController::viewWillAppear();
updateAddScriptRowDisplay();
}