summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 17:22:27 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 17:22:27 +0200
commit49d89c6138711ec3052da336ed084047a23a6c87 (patch)
treee5295d7cb79cdd31c2dba6a20392137f7f157a1d /Makefile
parent5f4bd983a169e2a0de1d35e781096f90163194c7 (diff)
parent077f4b7319c36f2c8bc243b462a992f10e896573 (diff)
Merge branch 'master' into allinone-nb
Conflicts (manually resolved: merge old and new parts): .gitmodules
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index eea7767..e469a98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
SOURCES = ikiwiki
-ikiwiki_VERSION = 2.62.1
+ikiwiki_VERSION = 3.20100704
# modules (subproject extension names) used. Expands SOURCES
ikiwiki_MODULES = templates basewiki smiley directives
# locales used. Expands SOURCES