From: smcv <smcv@web>
Date: Fri, 11 Jul 2014 21:33:39 +0000 (-0400)
Subject: album6 branch (needs an unmerged ikiwiki change, so album5 is still available)
X-Git-Tag: debian/3.20140815~27^2~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2ffd1c16800218fd2c20385dca6f67afb10273a7?hp=-c

album6 branch (needs an unmerged ikiwiki change, so album5 is still available)
---

2ffd1c16800218fd2c20385dca6f67afb10273a7
diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index c2f991d5a..9fac11164 100644
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -47,6 +47,10 @@ is to provide a direct link to the image.)
 Updated, June 2014: integrated changes from [[KathrynAndersen]],
 Lukas Lipavsky and kjs
 
+An `album6` branch is also available, but is less suitable
+for manual installation since it needs core IkiWiki changes
+(until [[bugs/trails depend on everything]] is fixed).
+
 ### Manual installation
 
 First, you need a version of ikiwiki with the [[trail]] plugin merged in