diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-11 17:01:38 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-11 17:01:38 +0000 |
commit | 42bc56dad3b9ba9920d6cec364ddda8f1bc93f7e (patch) | |
tree | b041e953b846e742438ae99de330462612273c6a /synapse/util/jsonobject.py | |
parent | pyflakes (diff) | |
parent | Allow newer versions of syutil (diff) | |
download | synapse-42bc56dad3b9ba9920d6cec364ddda8f1bc93f7e.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson
Diffstat (limited to 'synapse/util/jsonobject.py')
0 files changed, 0 insertions, 0 deletions