summary refs log tree commit diff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-27 12:54:43 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-27 12:54:43 +0100
commit3d1ae6139918ecb013c576a5eb0ed8e06103ebf6 (patch)
tree5056d9455cb6a0d72da1dc2b5dcf1a98c6282c6e /.travis.yml
parentBackport deferred.addTimeout (diff)
parentMerge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff)
downloadsynapse-3d1ae6139918ecb013c576a5eb0ed8e06103ebf6.tar.xz
Merge branch 'develop' into rav/deferred_timeout
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions