Merge branch 'master' into development

marcinbunsch · Jan 3, 2011 · 4ebf82b · 4ebf82b
2 parents 1c47796 + 0d10e6c
commit 4ebf82b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/config/environment.rb b/config/environment.rb
@@ -2,7 +2,7 @@
 require File.expand_path('../application', __FILE__)
 
 module BigTuna
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   DEFAULT_CONFIG = {
     "read_only" => false,

diff --git a/tmp/.gitkeep b/tmp/.gitkeep