aboutsummaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-12-12 09:31:50 +0000
committerlain <lain@soykaf.club>2019-12-12 09:31:50 +0000
commit68a667a465f0c51ba9842742ef010da7b69d7a69 (patch)
treea55a58db73256d74757c716334de8b8d60fd8941 /rel
parent8cb852523a13530ae77b76e4d3253ccd5883e9dc (diff)
parent63ffa0e3ed6640ba0c1e1e235b4cafa9ac386fb3 (diff)
downloadpleroma-68a667a465f0c51ba9842742ef010da7b69d7a69.tar.gz
Merge branch 'test-timeout' into 'develop'
Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions