summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-02-13 12:06:47 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-02-13 12:06:47 +0000
commit4ade761227383551a85f4a0b99b84d321d779fe0 (patch)
tree4d272570591b1ef322dd14e78479186e4a5f471c /modules
parentb92a01d3ae1d1bbb74f23469c929f60df69339be (diff)
trunk: Merge fix from luci-0.11
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-mini/luasrc/model/cbi/mini/system.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
index f2ab5e529..593af04f2 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@ -27,8 +27,8 @@ s.addremove = false
local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
local uptime = luci.sys.uptime()
-s:option(DummyValue, "_system", translate("System")).value = system
-s:option(DummyValue, "_cpu", translate("Processor")).value = model
+s:option(DummyValue, "_system", translate("System")).value = model
+s:option(DummyValue, "_cpu", translate("Processor")).value = system
local load1, load5, load15 = luci.sys.loadavg()
s:option(DummyValue, "_la", translate("Load")).value =