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)
1  2 
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

Simple merge
Simple merge
index 2d3b7348bd3d62bc953a51f1dc0ba935b667f488,0000000000000000000000000000000000000000..2d3b7348bd3d62bc953a51f1dc0ba935b667f488
mode 100644,000000..100644
--- /dev/null
index b45f935cc32c7db4daa847579ec0894a4bc0ab42,0000000000000000000000000000000000000000..b45f935cc32c7db4daa847579ec0894a4bc0ab42
mode 100644,000000..100644
--- /dev/null
index bf009c3dd2721443d9cf4719bfe70558b2eae08a,0000000000000000000000000000000000000000..bf009c3dd2721443d9cf4719bfe70558b2eae08a
mode 100644,000000..100644
--- /dev/null
index 7f609cade402653801823e4ebf4d67351c653ac3,0000000000000000000000000000000000000000..7f609cade402653801823e4ebf4d67351c653ac3
mode 100644,000000..100644
--- /dev/null
index ff5f0b352e27b44ec4bc60ea78fa88dc29c2ab6d,0000000000000000000000000000000000000000..ff5f0b352e27b44ec4bc60ea78fa88dc29c2ab6d
mode 100644,000000..100644
--- /dev/null
diff --cc lib/osm.rb
Simple merge