diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 08:10:34 -0500 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 08:10:34 -0500 |
commit | c05b5ef7b0410e74e7d81296df192895344235a8 (patch) | |
tree | 164735092ac5a244a037123f63b600bea1710ebe /scripts-dev/sphinx_api_docs.sh | |
parent | Merge branch 'daniel/useragent' into daniel/3pidinvites (diff) | |
parent | Explicitly add Create event as auth event (diff) | |
download | synapse-c05b5ef7b0410e74e7d81296df192895344235a8.tar.xz |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'scripts-dev/sphinx_api_docs.sh')
0 files changed, 0 insertions, 0 deletions