diff options
author | Erik Johnston <erik@matrix.org> | 2015-04-09 13:13:26 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-04-09 13:13:26 +0100 |
commit | 8bf285e08266f3035ce27ec3455ad9effef53e0e (patch) | |
tree | d1be74830e577cc13c1211e2ae3a622f2f0d28ba /synapse/storage/events.py | |
parent | Stream ordering and out of order insertions. (diff) | |
parent | Merge pull request #120 from matrix-org/bugs/SYN-339 (diff) | |
download | synapse-8bf285e08266f3035ce27ec3455ad9effef53e0e.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r-- | synapse/storage/events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py |