Powerful yet simple to use screenshot software :desktop_computer: :camera_flash:

Merge branch 'flameshot-org-master' into merge-from-upstream

# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp

Yuriy Puchkov committed 5y ago

654455e9ac8051ed6068017ea43b3833c7fa61ec