Permalink
Browse files

Merge branch 'release/0.6.60' into develop

  • Loading branch information...
2 parents b9dd57d + a934cfc commit 3d2aa7a743370ab3459f095c89d92d389c7ac948 @potomak potomak committed Sep 10, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 chrome_app/manifest.json
  2. +1 −1 config/application.rb
View
@@ -1 +1 @@
-{"name":"Tomatoes","app":{"urls":["http://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.6.59","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.60","description":"Pomodoro technique\u00ae web-based time tracker"}
View
@@ -16,7 +16,7 @@
end
module TomatoesApp
- VERSION = '0.6.59'
+ VERSION = '0.6.60'
REPO = 'https://github.com/potomak/tomatoes'
class Application < Rails::Application

0 comments on commit 3d2aa7a

Please sign in to comment.