Tom Hughes 7599f98957 Merge branch 'master' into notes ... Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/common.css.scss app/helpers/application_helper.rb		2012-11-20 19:08:30 +00: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	Get note comment notification working again	2012-10-14 16:01:34 +01:00
note_comment_notification.text.erb	Return the body of a note comment as a rich text object	2012-10-15 22:34:55 +01:00
signup_confirm.html.erb	Rework signup emails a bit	2012-11-05 09:54:58 +00:00
signup_confirm.text.erb	Rework signup emails a bit	2012-11-05 09:54:58 +00:00