diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-16 14:46:32 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-16 14:46:32 +0100 |
commit | 12122bfc36d26e0042ed89947072a82dcb3de0e2 (patch) | |
tree | 4f2499335cba1c83487bc21e9b533d8f8b57828a /docs/sphinx/conf.py | |
parent | Explicitly check for Sqlite3Engine (diff) | |
parent | Merge pull request #308 from matrix-org/markjh/v2_filter_encoding (diff) | |
download | synapse-12122bfc36d26e0042ed89947072a82dcb3de0e2.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'docs/sphinx/conf.py')
0 files changed, 0 insertions, 0 deletions