Commit 7a379e7d authored by Mark Harding's avatar Mark Harding
Browse files

Merge branch 'fix/1120-thumbnail-oom' into 'master' 

Memory limit hit getting mime type / Gif upload broken

See merge request !397
parents d562c2ac 06a5be9d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment