summary refs log tree commit diff
path: root/webclient/app-directive.js
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-22 11:47:08 +0100
committerErik Johnston <erik@matrix.org>2018-08-22 11:47:08 +0100
commit2f141f4c41b0bd8d8802f558f3ab4017c51a1684 (patch)
tree8be9a64740b248673f9ccadaf407ded5160af121 /webclient/app-directive.js
parentMerge branch 'rav/fix_gdpr_consent' into matrix-org-hotfixes (diff)
parentMerge pull request #3659 from matrix-org/erikj/split_profiles (diff)
downloadsynapse-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