From b8e5019e24339f7869dc4b473af15810d2476886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 2 Mar 2015 22:41:37 +0100
Subject: [PATCH] Corrected a merge error that broke the system menu display

Closes #797
---
 src/octoprint/static/js/app/viewmodels/settings.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index f9cd4079..30da456e 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -238,6 +238,8 @@ $(function() {
     
             self.temperature_profiles(response.temperature.profiles);
 
+            self.system_actions(response.system.actions);
+
             self.terminalFilters(response.terminalFilters);
         };