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

..

app

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

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

hicolor

fixing icon regression (#1051)

2020-10-12 08:40:35 -05:00

material

Merge 0.8.3 upstream

2020-10-02 10:15:56 +03:00

preview

Fixed readme

2020-09-28 19:33:36 -05:00