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-11-19 10:21:06 +00:00
2020-04-28 15:59:39 +05:30
2019-11-29 15:49:08 +00:00
2019-10-21 12:08:20 +01:00
2020-05-05 13:46:57 +10:00
2019-05-13 15:24:24 +01:00
2020-04-28 15:59:39 +05:30
2020-05-05 13:46:57 +10:00
2019-12-04 13:33:51 -05:00
2020-04-28 15:59:39 +05:30
2020-04-28 15:59:39 +05:30
2019-10-21 12:08:20 +01:00
2020-01-27 15:28:56 +01:00
2020-04-28 15:59:39 +05:30
2020-04-28 15:59:39 +05:30
2020-01-27 15:28:56 +01:00
2019-10-17 16:58:22 +11:00