Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:53:57 +0000 (19:53 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:53:57 +0000 (19:53 +0100)
commit959442d087b9b25fbec9c78ec122106b82d887dd
tree09f823b15e2d3164b1463e82056a20239ab9999f
parent0caaf54de5b85070548381a814106a07f366b11a
parent2e43a275de10e162d605df71e3e0f16ba596ad25
Merge branch 'master' into openstreetbugs
config/locales/en.yml
config/routes.rb
db/migrate/053_add_map_bug_tables.rb
db/migrate/054_refactor_map_bug_tables.rb
db/migrate/055_change_map_bug_comment_type.rb
db/migrate/056_add_date_closed.rb
db/migrate/057_add_map_bug_comment_event.rb
lib/osm.rb