aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMichel Etienne2014-04-01 15:15:45 +0200
committerMichel Etienne2014-04-01 15:15:45 +0200
commit60d21fcd366ad5ae570375ee440bf20280554d8e (patch)
tree0824d8b225b72707d9b5998dcc953b72bbdc3b36 /config
parent4c47c4445b3abda54ef52bfefdc361dda327e337 (diff)
parent3569b68bdf88b27b0ad4e1c0059efe432b89ae14 (diff)
downloadchouette-core-60d21fcd366ad5ae570375ee440bf20280554d8e.tar.bz2
Merge branch 'V2_3'
Diffstat (limited to 'config')
-rw-r--r--config/environment.rb2
-rw-r--r--config/environments/production.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 296970388..a7e4b12f3 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__)
ChouetteIhm::Application.initialize!
# Fix version
-APP_VERSION = '2.2.0'
+APP_VERSION = '2.3.0'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9e08d4145..1c6d5d69c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -76,7 +76,7 @@ ChouetteIhm::Application.configure do
# paths for external resources
config.to_prepare do
Devise::Mailer.layout "mailer"
- Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-cmd_2.2.0/chouette"
+ Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-cmd_2.3.0/chouette"
ImportTask.root = "/var/lib/chouette/imports"
Export.root = "/var/lib/chouette/exports"
end