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
..
assets/javascripts/initializers	Revert "FIX: Discobot has not been created with our custom avatar."	2020-05-06 11:28:42 -04:00
autoload/jobs	DEV: Use method instead of constant for discobot badge names	2020-04-09 20:46:51 -06:00
config	Update translations	2020-05-04 10:39:01 -04:00
db	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00
lib/discourse_narrative_bot	FEATURE: Nokogumbo (#9577)	2020-05-05 13:46:57 +10:00
public/images	remove unnecessary symlink	2019-11-29 22:23:43 +01:00
spec	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00
plugin.rb	Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""	2020-05-23 00:56:13 -04:00