Skip to content
Snippets Groups Projects
Commit 67e721e9 authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'need-more-time' into 'master' 

Stop Linux servers from hanging every 34 hours

See merge request !465
parents 27adf300 97de2ae4
No related branches found
No related tags found
2 merge requests!488Merge in next and don't billboard papersprites in GL,!465Stop Linux servers from hanging every 34 hours
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment