Jeremy Borgman 73fe772b70 resolving merge conflicts

2021-01-08 10:19:53 -06:00

..

build_cmake.yml

always trigger CI on PR

2020-10-27 16:48:49 +02:00

clang-format.yml

fixing clag format check

2021-01-05 17:01:12 -06:00

Linux-pack.yml

always trigger CI on PR

2020-10-27 16:48:49 +02:00

MacOS-pack.yml

MacOS - remove 'src/' from 'src/flameshot' on starting from DMG

2020-12-15 13:48:33 +02:00

Windows-pack.yml

always trigger CI on PR

2020-10-27 16:48:49 +02:00