Merge branch 'develop' of github.com:matrix-org/synapse into develop

11 files changed, 0 insertions, 0 deletions

diff --git a/scripts/check_auth.py b/scripts-dev/check_auth.py

index b889ac7fa7..b889ac7fa7 100644
--- a/scripts/check_auth.py
+++ b/scripts-dev/check_auth.py
diff --git a/scripts/check_event_hash.py b/scripts-dev/check_event_hash.py

index 679afbd268..679afbd268 100644
--- a/scripts/check_event_hash.py
+++ b/scripts-dev/check_event_hash.py
diff --git a/scripts/check_signature.py b/scripts-dev/check_signature.py

index 59e3d603ac..59e3d603ac 100644
--- a/scripts/check_signature.py
+++ b/scripts-dev/check_signature.py
diff --git a/scripts/copyrighter-sql.pl b/scripts-dev/copyrighter-sql.pl

index 890e51e587..890e51e587 100755
--- a/scripts/copyrighter-sql.pl
+++ b/scripts-dev/copyrighter-sql.pl
diff --git a/scripts/copyrighter.pl b/scripts-dev/copyrighter.pl

index a913d74c8d..a913d74c8d 100755
--- a/scripts/copyrighter.pl
+++ b/scripts-dev/copyrighter.pl
diff --git a/scripts/database-save.sh b/scripts-dev/database-save.sh

index 040c8a4943..040c8a4943 100755
--- a/scripts/database-save.sh
+++ b/scripts-dev/database-save.sh
diff --git a/scripts/federation_client.py b/scripts-dev/federation_client.py

index ea62dceb36..ea62dceb36 100644
--- a/scripts/federation_client.py
+++ b/scripts-dev/federation_client.py
diff --git a/scripts/hash_history.py b/scripts-dev/hash_history.py

index bdad530af8..bdad530af8 100644
--- a/scripts/hash_history.py
+++ b/scripts-dev/hash_history.py
diff --git a/scripts/make_identicons.pl b/scripts-dev/make_identicons.pl

index cbff63e298..cbff63e298 100755
--- a/scripts/make_identicons.pl
+++ b/scripts-dev/make_identicons.pl
diff --git a/scripts/nuke-room-from-db.sh b/scripts-dev/nuke-room-from-db.sh

index 58c036c896..58c036c896 100755
--- a/scripts/nuke-room-from-db.sh
+++ b/scripts-dev/nuke-room-from-db.sh
diff --git a/scripts/sphinx_api_docs.sh b/scripts-dev/sphinx_api_docs.sh

index ee72b29657..ee72b29657 100644
--- a/scripts/sphinx_api_docs.sh
+++ b/scripts-dev/sphinx_api_docs.sh