summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-24 23:42:25 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-24 23:42:25 +1000
commit04eed80a73add90b5591fa5943648402dcd5bcaf (patch)
treea84f7bfee019b7ad0e79637bba015777ae663461 /.gitignore
parentMerge pull request #3927 from matrix-org/erikj/handle_background_errors (diff)
parentMerge tag 'v0.33.5' (diff)
downloadsynapse-04eed80a73add90b5591fa5943648402dcd5bcaf.tar.xz
Merge branch 'master' into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions