From b5d55dd856a5f7fbcf902cb61ee8db41e95e03e5 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 8 Aug 2012 13:24:49 -0500
Subject: [PATCH] moved favicon.* in images

---
 VERSION                                             |   2 +-
 .../welcome/static/{ => images}/favicon.ico         | Bin
 .../welcome/static/{ => images}/favicon.png         | Bin
 applications/welcome/static/robots.txt              |   2 --
 applications/welcome/views/layout.html              |   5 ++---
 5 files changed, 3 insertions(+), 6 deletions(-)
 rename applications/welcome/static/{ => images}/favicon.ico (100%)
 rename applications/welcome/static/{ => images}/favicon.png (100%)
 delete mode 100644 applications/welcome/static/robots.txt

diff --git a/VERSION b/VERSION
index 85d7de35..619983b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-08 13:16:22) dev
+Version 2.00.0 (2012-08-08 13:24:46) dev
diff --git a/applications/welcome/static/favicon.ico b/applications/welcome/static/images/favicon.ico
similarity index 100%
rename from applications/welcome/static/favicon.ico
rename to applications/welcome/static/images/favicon.ico
diff --git a/applications/welcome/static/favicon.png b/applications/welcome/static/images/favicon.png
similarity index 100%
rename from applications/welcome/static/favicon.png
rename to applications/welcome/static/images/favicon.png
diff --git a/applications/welcome/static/robots.txt b/applications/welcome/static/robots.txt
deleted file mode 100644
index 8cb06798..00000000
--- a/applications/welcome/static/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /welcome/default/user
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 56e5d2e1..e12fe0ea 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -31,9 +31,8 @@
 	user-scalable = yes allows the user to zoom in -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <!-- Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references -->
-  <link rel="shortcut icon" href="{{=URL('static','favicon.ico')}}" type="image/x-icon">
-  <link rel="apple-touch-icon" href="{{=URL('static','favicon.png')}}">
+  <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
+  <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
   
   <!-- All JavaScript at the bottom, except for Modernizr which enables 
        HTML5 elements & feature detects -->