Michael Brown d9a02d1336
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""
This reverts commit 20780a1eeed56b321daf18ee6bbfe681a51d1bf4.

* 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
..
2019-10-04 13:25:54 -04:00
2019-01-21 13:40:55 -05:00
2019-07-26 10:57:22 -04:00
2016-11-16 12:44:22 +08:00
2018-06-08 11:49:31 +02:00
2020-04-24 19:32:02 -04:00