diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-11 16:12:59 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-11 16:12:59 +0000 |
commit | 41a9a76a99b5668217ed0bd97dda2b8689d13c1b (patch) | |
tree | d0326a7a299eef31fa89d8b91fa871732a148890 /CHANGES.rst | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati... (diff) | |
parent | Merge pull request #65 from matrix-org/get_event_cache (diff) | |
download | synapse-41a9a76a99b5668217ed0bd97dda2b8689d13c1b.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to 'CHANGES.rst')
-rw-r--r-- | CHANGES.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 922fa5b035..113838b1c0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,8 @@ Changes in develop ================== * pydenticon support -- adds dep on pydenticon + * pylru + * simplejson Changes in synapse 0.6.1 (2015-01-07) ===================================== |