Commit graph

3 commits

Author SHA1 Message Date
Michael Delpach 50f86ee79a Revert "Revert "Merge branch 'master' of https://github.com/ShareX/ShareX""
This reverts commit 85fdab3c56.
2020-07-06 06:37:56 +08:00
Michael Delpach 85fdab3c56 Revert "Merge branch 'master' of https://github.com/ShareX/ShareX"
This reverts commit 2903ca1082, reversing
changes made to 195c0f2f8a.
2020-07-06 06:27:50 +08:00
Jaex 7df4ad672f Restrict extraction of image effect packages to 20mb to prevent zip bomb attacks 2020-06-27 01:04:43 +03:00