diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
commit | 31a049eb692d37387a2db972da754f7ec56218c7 (patch) | |
tree | 9e5f47abad904d30c08d2f340b543a631e436894 /docs/sphinx/README.rst | |
parent | Include room membership in room initialSync (diff) | |
parent | SYN-148: Add the alias after creating the room (diff) | |
download | synapse-31a049eb692d37387a2db972da754f7ec56218c7.tar.xz |
Merge branch 'develop' into room-initial-sync
Conflicts: synapse/handlers/message.py
Diffstat (limited to 'docs/sphinx/README.rst')
-rw-r--r-- | docs/sphinx/README.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/sphinx/README.rst b/docs/sphinx/README.rst new file mode 100644 index 0000000000..a7ab7c5500 --- /dev/null +++ b/docs/sphinx/README.rst @@ -0,0 +1 @@ +TODO: how (if at all) is this actually maintained? |