Merge branch 'master' into 2.0-beta

This commit is contained in:
Hylke Bons 2017-08-13 22:19:03 +02:00
commit 5307242b44

View file

@ -1,11 +1,6 @@
theme = hicolor
app_themedir = $(pkgdatadir)/icons/$(theme)
if BUILD_FLATPAK
system_themedir = $(app_themedir)
else
system_themedir = $(datadir)/icons/$(theme)
endif
system_theme_icons = \
apps,org.sparkleshare.SparkleShare-16.png \