Tom Hughes 0d3a9ed9cb Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml config/openlayers.cfg db/structure.sql vendor/assets/openlayers/OpenLayers.js		2012-08-22 20:52:08 +01:00
..
_gpx_description.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00:00
diary_comment_notification.html.erb	Add an HTML version of the diary comment notification mail	2012-03-17 16:36:58 +00:00
diary_comment_notification.text.erb	Treat all newly entered blocks of text as Markdown	2012-03-17 16:36:55 +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	Treat all newly entered blocks of text as Markdown	2012-03-17 16:36:55 +00:00
message_notification.text.erb	Treat all newly entered blocks of text as Markdown	2012-03-17 16:36:55 +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