summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 17:13:33 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 17:13:33 +0100
commitd5a825edee07cc0e66904283ea86a923b50beb69 (patch)
tree8b06dbdbac6d79c6a23b3fb8037b579ccf223a8e /.gitignore
parentMerge branch 'develop' into refresh (diff)
parentRemove incorrect whitespace (diff)
downloadsynapse-d5a825edee07cc0e66904283ea86a923b50beb69.tar.xz
Merge branch 'auth' into refresh
Conflicts:
	synapse/handlers/register.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions