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
..
2018-02-22 15:03:41 +08:00
2019-05-02 16:23:25 +10:00
2016-02-22 18:28:09 +05:30
2018-09-17 09:49:53 +10:00
2017-10-27 09:13:04 +05:30
2020-01-21 19:23:08 +02:00