summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 08:10:34 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 08:10:34 -0500
commitc05b5ef7b0410e74e7d81296df192895344235a8 (patch)
tree164735092ac5a244a037123f63b600bea1710ebe /setup.py
parentMerge branch 'daniel/useragent' into daniel/3pidinvites (diff)
parentExplicitly add Create event as auth event (diff)
downloadsynapse-c05b5ef7b0410e74e7d81296df192895344235a8.tar.xz
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions