summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-02-23 15:11:35 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-02-23 15:11:35 +0000
commit28ad246bb46c6227f17f86788f6f438eaf48328d (patch)
tree5179d927a8d339151131a1faf79cd79fb8265179 /.gitignore
parentMerge pull request #600 from matrix-org/erikj/presence (diff)
parentAllow third_party_signed to be specified on /join (diff)
downloadsynapse-28ad246bb46c6227f17f86788f6f438eaf48328d.tar.xz
Merge pull request #584 from matrix-org/daniel/ephemeralthreepids
Allow third_party_signed to be specified on /join
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions