Tom Hughes 52e5fa6ad7 Merge branch 'master' into openstreetbugs ... Conflicts: app/views/browse/_map.html.erb app/views/site/index.html.erb config/initializers/mime_types.rb config/routes.rb lib/map_boundary.rb lib/migrate.rb lib/osm.rb vendor/assets/openlayers/OpenLayers.js		2012-01-05 20:15:53 +00:00
..
_gpx_description.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00:00
diary_comment_notification.text.erb	Replace @body with @text again...	2011-12-18 17:46:21 +00:00
email_confirm.html.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00
email_confirm.text.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00
friend_notification.text.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00
gpx_failure.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00:00
gpx_success.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00:00
lost_password.html.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00
lost_password.text.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00
message_notification.html.erb	Add an HTML version of the message notification email	2011-12-01 19:17:16 +00:00
message_notification.text.erb	Don't escape anything in text/plain message notifications	2011-12-03 17:58:21 +00:00
note_comment_notification.html.erb	Mass rename of "bugs" as "notes" for increased user friendliness	2011-05-21 17:22:31 +01:00
signup_confirm.html.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00
signup_confirm.text.erb	Rename notifier views to new style names	2011-11-14 09:42:45 +00:00