Merge branch 'release/0.6.4' into develop

jkao · Dec 1, 2011 · 5647835 · 5647835
2 parents 8efa4f9 + 226561e
commit 5647835
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/chrome_app/manifest.json b/chrome_app/manifest.json
@@ -1 +1 @@
-{"name":"Tomatoes","app":{"urls":["http://tomatoes.heroku.com/"],"launch":{"web_url":"http://tomatoes.heroku.com/"}},"icons":{"128":"icon_128.png"},"version":"0.6.3","description":"Pomodoro technique online time tracker"}
+{"name":"Tomatoes","app":{"urls":["http://tomatoes.heroku.com/"],"launch":{"web_url":"http://tomatoes.heroku.com/"}},"icons":{"128":"icon_128.png"},"version":"0.6.4","description":"Pomodoro technique online time tracker"}
diff --git a/config/application.rb b/config/application.rb
@@ -16,7 +16,7 @@
 end
 
 module TomatoesApp
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
   REPO = 'https://github.com/potomak/tomatoes'
 
   class Application < Rails::Application