summary refs log tree commit diff
path: root/docs/README.rst
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-11-06 11:59:22 -0500
committerHubert Chathi <hubert@uhoreg.ca>2019-11-06 11:59:22 -0500
commita5a59ab8ac6d6b244158261ee4d307d419b20180 (patch)
treed809f7205647c13b93a103727dab6f4a19c878e4 /docs/README.rst
parentfix merge conflict (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-a5a59ab8ac6d6b244158261ee4d307d419b20180.tar.xz
Merge branch 'develop' into uhoreg/e2e_backup_hash
Diffstat (limited to 'docs/README.rst')
-rw-r--r--docs/README.rst6
1 files changed, 0 insertions, 6 deletions
diff --git a/docs/README.rst b/docs/README.rst
deleted file mode 100644
index 3012da8b19..0000000000
--- a/docs/README.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-All matrix-generic documentation now lives in its own project at
-
-github.com/matrix-org/matrix-doc.git
-
-Only Synapse implementation-specific documentation lives here now
-(together with some older stuff will be shortly migrated over to matrix-doc)