Merge 7296:7427 from export branch to trunk.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index be3cf2a8f3c4fff81dcb348fad9c138b6bc8e6aa..02d99f20c6095cca73e5138c70fb7a77e5aab37d 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -68,3 +68,8 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 end
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 end

+
+# This has to be after the above block for some reason (doesnt pull in /lib/osm.rb?)
+POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
+
+