diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
commit | f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4 (patch) | |
tree | 96cfd120f7bdb70c1045a8080f4f97f3a30bd574 /CHANGES.rst | |
parent | Minor tweaks based on PR feedback. (diff) | |
parent | Merge branch 'bugs/SYN-264' into develop (diff) | |
download | synapse-f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4.tar.xz |
Merge branch 'develop' into application-services
Diffstat (limited to '')
-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) ===================================== |