git.openstreetmap.org Git - rails.git/commit

]> git.openstreetmap.org Git - rails.git/commit

Merge 15165:15373 from trunk.

25 files changed:

app/controllers/amf_controller.rb		diff \| blob \| history
app/controllers/browse_controller.rb		diff \| blob \| history
app/controllers/way_controller.rb		diff \| blob \| history
app/models/old_relation.rb		diff \| blob \| history
app/models/old_way.rb		diff \| blob \| history
app/models/relation.rb		diff \| blob \| history
app/views/browse/_node_details.rhtml		diff \| blob \| history
app/views/browse/_tag.rhtml		diff \| blob \| history
app/views/browse/_way_details.rhtml		diff \| blob \| history
app/views/changeset/_changeset.rhtml		diff \| blob \| history
app/views/export/start.rjs		diff \| blob \| history
app/views/layouts/site.rhtml		diff \| blob \| history
config/initializers/action_mailer.rb		diff \| blob \| history
config/initializers/load_configs.rb		diff \| blob \| history
config/lighttpd.conf		diff \| blob \| history
config/text_outputs/en.yml	[deleted file]	blob \| history
db/migrate/005_tile_tracepoints.rb		diff \| blob \| history
db/migrate/006_tile_nodes.rb		diff \| blob \| history
lib/map_boundary.rb		diff \| blob \| history
lib/osm.rb		diff \| blob \| history
public/images/sotm.png	[new file with mode: 0644]	blob
public/javascripts/site.js		diff \| blob \| history
public/potlatch/potlatch.swf		diff \| blob \| history
public/stylesheets/site.css		diff \| blob \| history
test/functional/relation_controller_test.rb		diff \| blob \| history

The OpenStreetMap web site