Merge branch 'release/0.6.47' into develop

tomatoes-app · Jul 10, 2012 · d10b488 · d10b488
2 parents cf2853a + 0e6a785
commit d10b488
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://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.6.46","description":"Pomodoro technique\u00ae web-based time tracker"}
+{"name":"Tomatoes","app":{"urls":["http://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.6.47","description":"Pomodoro technique\u00ae web-based time tracker"}
diff --git a/config/application.rb b/config/application.rb
@@ -16,7 +16,7 @@
 end
 
 module TomatoesApp
-  VERSION = '0.6.46'
+  VERSION = '0.6.47'
   REPO = 'https://github.com/potomak/tomatoes'
 
   class Application < Rails::Application