luci-0.8: merge r4520
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 29 May 2009 19:56:47 +0000 (19:56 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 29 May 2009 19:56:47 +0000 (19:56 +0000)
commit9f6b7550e481e8237359f882c9dfbb2f07c88e2c
tree970d5f1890f2916b1d2cb189e1a068b52da30847
parent318c7831baa43f81718878be36e6ceffc3ee9e38
luci-0.8: merge r4520
modules/admin-full/luasrc/controller/admin/network.lua
modules/admin-full/luasrc/controller/admin/status.lua
modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua [deleted file]
modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
modules/admin-full/luasrc/model/cbi/admin_status/conntrack.lua [new file with mode: 0644]
modules/admin-full/luasrc/model/cbi/admin_status/routes.lua [new file with mode: 0644]
modules/admin-full/luasrc/view/admin_system/upgrade.htm