summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-27 16:54:12 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-27 16:54:12 +0100
commit1d95e78759cc1307d15d6cc6388f52063e833355 (patch)
tree0307617989016019bfd1d41a15b22499d02091ef /.gitignore
parentadd _get_room_member, fix datastore methods (diff)
parentAdded RestServlet for /rooms/$roomid/initialSync (diff)
downloadsynapse-1d95e78759cc1307d15d6cc6388f52063e833355.tar.xz
Merge branch 'develop' into storage_transactions
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore

index 14bd9078f3..55fa8b819c 100644 --- a/.gitignore +++ b/.gitignore
@@ -10,7 +10,7 @@ docs/build/ *.egg-info cmdclient_config.json -homeserver.db +homeserver*.db .coverage htmlcov