diff options
author | Erik Johnston <erik@matrix.org> | 2018-08-22 11:47:08 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-08-22 11:47:08 +0100 |
commit | 2f141f4c41b0bd8d8802f558f3ab4017c51a1684 (patch) | |
tree | 8be9a64740b248673f9ccadaf407ded5160af121 /webclient/app-directive.js | |
parent | Merge branch 'rav/fix_gdpr_consent' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3659 from matrix-org/erikj/split_profiles (diff) | |
download | synapse-2f141f4c41b0bd8d8802f558f3ab4017c51a1684.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'webclient/app-directive.js')
0 files changed, 0 insertions, 0 deletions