Permalink
Browse files

Merge branch 'release/0.6.12'

  • Loading branch information...
potomak committed Jun 14, 2012
2 parents f8e7b4d + b07a8da commit 15bdd1dbf3aa6868a0bfab8477081099fc03f23f
Showing with 3 additions and 3 deletions.
  1. +1 −1 chrome_app/manifest.json
  2. +1 −1 config/application.rb
  3. +1 −1 config/environments/production.rb
View
@@ -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.11","description":"Pomodoro technique\u00ae web-based 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.12","description":"Pomodoro technique\u00ae web-based time tracker"}
View
@@ -16,7 +16,7 @@
end
module TomatoesApp
- VERSION = '0.6.11'
+ VERSION = '0.6.12'
REPO = 'https://github.com/potomak/tomatoes'
class Application < Rails::Application
@@ -43,7 +43,7 @@
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
- config.assets.precompile += %w( jquery.flot.js jquery.flot.selection.js user_charts.js )
+ config.assets.precompile += %w( jquery.flot.js jquery.flot.selection.js user_charts.js TT_init.js )
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false

0 comments on commit 15bdd1d

Please sign in to comment.