diff options
| author | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
| commit | 0bba2799b6eeaf95b52ba9c4f2831def37d8effd (patch) | |
| tree | f4da51c1d29e54bfa06c4935a188245592a99a90 /synapse/app | |
| parent | s/underride/override/ in the rule_id too (diff) | |
| parent | Merge pull request #1015 from matrix-org/erikj/preview_url_fixes (diff) | |
| download | synapse-0bba2799b6eeaf95b52ba9c4f2831def37d8effd.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions