From ee98082a6051a4871a1936bd2ddf7d3d97729980 Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Mon, 4 Jun 2018 12:12:48 +0100
Subject: [PATCH] update MSC1270

---
 scripts/proposals.py        | 2 ++
 specification/proposals.rst | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 scripts/proposals.py

diff --git a/scripts/proposals.py b/scripts/proposals.py
old mode 100644
new mode 100755
index 241b0708d..aa2252bcb
--- a/scripts/proposals.py
+++ b/scripts/proposals.py
@@ -1,3 +1,5 @@
+#! /usr/bin/env python
+
 # proposals.py: generate an RST file (proposals.rst) from queries to github.com/matrix.org/matrix-doc/issues.
 # v0.0.1
 
diff --git a/specification/proposals.rst b/specification/proposals.rst
index 636877ffb..9e0becf35 100644
--- a/specification/proposals.rst
+++ b/specification/proposals.rst
@@ -229,9 +229,9 @@ proposal-ready-for-review
      - None
      - 
    * - `MSC1270 <https://github.com/matrix-org/matrix-doc/issues/1270>`_
-     - Synapse /_matrix/media/v1/resolve_url to API download and preview urls in the clients despite on CORS
-     - 2018-05-31
+     - Add /_matrix/media/v1/resolve_url to Client-Server API: download and preview urls in the clients despite CORS
      - 2018-05-31
+     - 2018-06-04
      - `1270-1 <https://docs.google.com/document/d/1bbX1yxNETmMa-AxBGjIpb4lNoTuc3vjGXmbZWrNBlzM/edit?usp=sharing>`_
      - `@oivoodoo`_
      - None
@@ -376,7 +376,7 @@ spec-pr-missing
    * - `MSC739 <https://github.com/matrix-org/matrix-doc/issues/739>`_
      - Reporting inappropriate content in Matrix
      - 2016-11-21
-     - 2018-05-15
+     - 2018-05-31
      - `739-1 <https://docs.google.com/document/d/15cUuF0VyBMtNIcyFqXvEmXsMURLgXzMOIW33qHoi89A/edit>`_
      - `@ara4n`_
      - None