From b3e606295ea22f8c42a2ea782d0f2f022ff66b29 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 7 Oct 2015 13:04:12 -0500
Subject: [PATCH] committed changelog and removed unwanted file

---
 CHANGELOG                                  | 4 ++++
 applications/welcome/views/test/index.html | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 applications/welcome/views/test/index.html

diff --git a/CHANGELOG b/CHANGELOG
index 7478c199..5972aeb2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+## master
+- Change .flash and .hidden to .w2p_flash and .w2p_hidden
+     - copy the static folder from the new welcome app when you update web2py
+
 ## 2.12.1
 
 - security fix: Validate for open redirect everywhere, not just in login()
diff --git a/applications/welcome/views/test/index.html b/applications/welcome/views/test/index.html
deleted file mode 100644
index 8578b499..00000000
--- a/applications/welcome/views/test/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{extend 'layout.html'}}
-
-{{=form}}
-
-{{=grid}}