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

..

appdata

Added releasing info for v0.8.5

2020-10-14 18:43:26 -05:00

dbus

dbus/org.dharkael.Flameshot.xml: Mark id as uint

2020-09-07 19:33:10 -05:00

desktopEntry/package

organizing files

2020-10-14 11:08:12 -05:00

img

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

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

shell-completion

organizing files

2020-10-14 11:08:12 -05:00

snap

Cleaned up flatpak build for flathub submission (#1040)

2020-10-10 13:04:19 -05:00

translations

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

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

flameshot.rc

feat: update windows rc file

2020-09-30 10:58:48 -05:00

graphics.qrc

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

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