Yuriy Puchkov 654455e9ac 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

2020-10-15 15:44:49 +03:00

..

build_cmake.yml

Merge branch 'flameshot-org-master' into bugfix/memory-leak

2020-10-11 20:49:15 +03:00

clang-format.yml

chore(CI): checkout the head commit instead of using the default merge ref

2020-10-10 08:16:39 -05:00

Linux-pack.yml

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

2020-10-15 15:44:49 +03:00

Windows-pack.yml

Merge branch 'flameshot-org-master' into bugfix/memory-leak

2020-10-11 20:49:15 +03:00