summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-06-04 01:16:01 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2019-06-04 01:16:01 +1000
commit6f9f08005cd8973418662c716fec7c808e2cd0b2 (patch)
tree83af2f021f64c90003b94fce60f839a2bc6192aa /.circleci
parentadd stuff in bg updates (diff)
parentMerge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... (diff)
downloadsynapse-6f9f08005cd8973418662c716fec7c808e2cd0b2.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions