From 8418a770a2be476ecd961d3279d00e151a0a5318 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Jan 2015 17:56:48 +0100 Subject: Sync with HEAD of basewiki directives javascript openid-selector perl templates themes. --- basewiki | 2 +- directives | 2 +- javascript | 2 +- openid-selector | 2 +- perl | 2 +- templates | 2 +- themes | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basewiki b/basewiki index e97cccc..46c04b3 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit e97cccc665b35a55f6d79d6928d2f081f1c101ce +Subproject commit 46c04b3f2f49aa53e2048223a3c54356c000944b diff --git a/directives b/directives index 7609bea..224ca3c 160000 --- a/directives +++ b/directives @@ -1 +1 @@ -Subproject commit 7609bea2373599512f0be20a688941f0b84b7916 +Subproject commit 224ca3cd99c6378f1bad4c69366d7b522e471e22 diff --git a/javascript b/javascript index fb99bcb..03dcd66 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit fb99bcb1b9c1cd9ec9caa406a5ec852b0505cee1 +Subproject commit 03dcd664cb91b0a81973769c0d34dea627ba8a61 diff --git a/openid-selector b/openid-selector index 05a2d7c..fbffc8a 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit 05a2d7cfedce22fbf01499167dc7b5acf28d5462 +Subproject commit fbffc8a34362d9beff504923560871e70ce0f817 diff --git a/perl b/perl index 500f530..7cb3d8b 160000 --- a/perl +++ b/perl @@ -1 +1 @@ -Subproject commit 500f530aaecf7d3a62c9e848cda6333d47248a46 +Subproject commit 7cb3d8bf56d568a7228ec234c2ce69ed7beb6fa5 diff --git a/templates b/templates index 52644b5..d579c1a 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 52644b53374f54b5be99600d87aa468510dde288 +Subproject commit d579c1ac1f0b3144921d342e659aff7008aaea05 diff --git a/themes b/themes index 0c018b0..3d934d3 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit 0c018b0097c46baf130c3db63131cfdb0af5dd2e +Subproject commit 3d934d315550b023181a52e69f73326de79001e6 -- cgit v1.2.3 From 03685c64a7597ac1d33540c1efcbc68e36573fde Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:18:34 +0100 Subject: Use new IKIWIKI_UNDERLAYS for styling. --- include.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include.mk b/include.mk index bff485a..ce5210e 100644 --- a/include.mk +++ b/include.mk @@ -12,5 +12,5 @@ IKIWIKI_SHARED_DEFAULTS ?= \ --set underlaydirbase='$(CURDIR)/shared' \ --underlaydir '$(CURDIR)/shared/basewiki' \ --libdir '$(CURDIR)/shared/perl' \ - --set-yaml add_underlays='- $(CURDIR)/styling' \ +IKIWIKI_UNDERLAYS ?= $(CURDIR)/styling -- cgit v1.2.3 From ce086c50aed1498aa959ba96dc75f35a753cba90 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 13 Mar 2017 15:43:43 +0100 Subject: Sync with HEAD of basewiki. --- basewiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basewiki b/basewiki index 46c04b3..b911c9c 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit 46c04b3f2f49aa53e2048223a3c54356c000944b +Subproject commit b911c9cc473b680aa51dbca391ba145661efa0bd -- cgit v1.2.3