Merge branch 'master' into master-da

Conflicts:
	themes

2 files changed, 1 insertions, 0 deletions

diff --git a/include.mk b/include.mk
index 601dc9e..819edda 100644
--- a/include.mk
+++ b/include.mk
@@ -2,3 +2,4 @@ IKIWIKI_SHARED_OPTIONS ?= \
 	--templatedir $(CURDIR)/shared/templates \
 	--underlaydir $(CURDIR)/shared/basewiki \
 	--libdir $(CURDIR)/shared/perl \
+	--set exclude='^.*\.(rb|scss)$$'
diff --git a/themes b/themes
-Subproject 7b2c9924b829a5fd77ac5897aa72a3e8fe30773
+Subproject 8eab8cb555bf9c49f9a7b017afe67a37a52c6ac