summaryrefslogtreecommitdiff
path: root/underlays
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-24 00:55:09 -0400
committerJoey Hess <joey@kitenet.net>2010-04-24 00:55:09 -0400
commit998f47ed137959d0a0951368d8d0f891673c3ce5 (patch)
tree10b26da9fe1513c3b8b4990e6caa7446352218a5 /underlays
parent39d4bfde6b9c49f0a8b13699be701bda11eb851a (diff)
parente90d67d3c9a93862657563e17e24054087f205d1 (diff)
Merge branch 'master' into templatemove
Diffstat (limited to 'underlays')
-rw-r--r--underlays/javascript/ikiwiki/ikiwiki.js (renamed from underlays/javascript/ikiwiki.js)0
-rw-r--r--underlays/javascript/ikiwiki/relativedate.js (renamed from underlays/javascript/relativedate.js)0
-rw-r--r--underlays/javascript/ikiwiki/toggle.js (renamed from underlays/javascript/toggle.js)0
3 files changed, 0 insertions, 0 deletions
diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki/ikiwiki.js
index aebc5cf7e..aebc5cf7e 100644
--- a/underlays/javascript/ikiwiki.js
+++ b/underlays/javascript/ikiwiki/ikiwiki.js
diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js
index 5142332f1..5142332f1 100644
--- a/underlays/javascript/relativedate.js
+++ b/underlays/javascript/ikiwiki/relativedate.js
diff --git a/underlays/javascript/toggle.js b/underlays/javascript/ikiwiki/toggle.js
index d190b737a..d190b737a 100644
--- a/underlays/javascript/toggle.js
+++ b/underlays/javascript/ikiwiki/toggle.js