summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-10-25 17:04:59 +0100
committerGitHub <noreply@github.com>2018-10-25 17:04:59 +0100
commitc85e063302243d2c82da6e709cf1e93b5b3085e9 (patch)
tree05bde2fb78f07141bda83d0a4fa54f08c19ec55c /synapse/rest
parentMerge pull request #4081 from matrix-org/neilj/fix_mau_init (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... (diff)
downloadsynapse-c85e063302243d2c82da6e709cf1e93b5b3085e9.tar.xz
Merge pull request #4051 from matrix-org/erikj/alias_disallow_list
Add config option to control alias creation
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions