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

0 lines

Plaintext

Raw Blame History