Michael Brown d9a02d1336 Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" ... This reverts commit 20780a1eee. * SECURITY: re-adds accidentally reverted commit: 03d26cd6: ensure embed_url contains valid http(s) uri * when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on instead of the 03d26cd6 parent (which contains security fixes)		2020-05-23 00:56:13 -04:00
..
_mailing_list_post.html.erb	FEATURE: secure_email site setting to prevent data going out in email	2017-04-26 13:05:56 -04:00
_post.html.erb	UX: use same styling for username and user-name	2020-02-20 17:51:37 +05:30
_secure_mailing_list_post.html.erb	FEATURE: secure_email site setting to prevent data going out in email	2017-04-26 13:05:56 -04:00
default_template.html	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00
notification.html.erb	FEATURE: add option to always send excerpts in emails	2019-08-06 12:45:28 -04:00
unsubscribe.html.erb	FEATURE: customization of html emails (#7934)	2019-07-30 15:05:08 -04:00
unsubscribed.html.erb	SECURITY: do not show private topic title on /unsubscribed page	2018-04-16 10:35:57 +05:30