summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-07 16:35:22 +0100
committerDavid Baker <dave@matrix.org>2016-04-07 16:35:22 +0100
commit9c99ab4572623a8a9554e6c0292f34059252c6b7 (patch)
tree3b231aab16688d64bc6e30561ddd42949c2ab727 /LICENSE
parentRemove code that's now been obsoleted or moved elsewhere (diff)
parentMerge pull request #703 from matrix-org/erikj/member (diff)
downloadsynapse-9c99ab4572623a8a9554e6c0292f34059252c6b7.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions