cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved.

Browse source
This commit is contained in:
Shaun McDonald 2008-09-25 15:06:05 +00:00
commit d9e070e069
395 changed files with 2348 additions and 25020 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/environment.rb
View file

@ -74,8 +74,3 @@ Rails::Initializer.run do |config|
# 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()