summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-28 13:39:42 +0100
committerErik Johnston <erik@matrix.org>2015-04-28 13:39:42 +0100
commit327ca883ec51780ea2a914d3c89ca0499f4656ac (patch)
treedc3f2c06cdbbfce8b1d1bb6a4db31a8852f5b43a /.gitignore
parentQuickly fix dodgy est. time remaining (diff)
parentMerge pull request #126 from matrix-org/csauth (diff)
downloadsynapse-327ca883ec51780ea2a914d3c89ca0499f4656ac.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions