From 50d24304361f2d11838b6c596a7392858df5d398 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 20 Mar 2013 09:35:45 -0700
Subject: [PATCH] fixes #996

---
 app/assets/stylesheets/common/main_layout.css.scss | 3 +--
 config/danbooru_default_config.rb                  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss
index 2f1d7f018..d21ab394e 100644
--- a/app/assets/stylesheets/common/main_layout.css.scss
+++ b/app/assets/stylesheets/common/main_layout.css.scss
@@ -70,10 +70,9 @@ div#page {
 }
 
 footer#page-footer {
-  float: left;
   clear: both;
   width: 100%;
-  margin: 1em;
+  margin: 1em 0;
   text-align: center;
   padding-top: 1em;
   border-top: 1px solid #EEE;
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 493f3e94f..61ec3920f 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.1.0"
+      "2.2.0"
     end
 
     # The name of this Danbooru.