summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-02-02 14:05:42 +0000
committerMark Haines <mark.haines@matrix.org>2015-02-02 14:05:42 +0000
commit6e856d772989efe3fabc49f84f966c6407071698 (patch)
treed4cce2877b6b579e828a4a3cb22e91a4ab2dd05c /.gitignore
parentIgnore empty strings for display names & room names in notifications (diff)
parentfix OSX stuff and typos (diff)
downloadsynapse-6e856d772989efe3fabc49f84f966c6407071698.tar.xz
Merge master into develop
Conflicts:
	README.rst
	setup.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions