From: Manuel Munz <freifunk@somakoma.de>
Date: Sun, 28 Aug 2011 16:19:08 +0000 (+0000)
Subject: luci-0.10: Merge r7384
X-Git-Tag: 0.10.0~81
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f70dee6125730ff261576fc81decec4c23086c97;p=oweals%2Fluci.git

luci-0.10: Merge r7384
---

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 1083a1618..372fa5971 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -78,6 +78,11 @@ $Id$
 					))
 				end
 			%></li>
+			<li><% if keepconfig then %>
+				<%:Configuration files will be kept.%>
+			<% else %>
+				<%:Note: Configuration files will be erased.%>
+			<% end %></li>
 		</ul>
 	</p>
 	<div class="cbi-page-actions right">