From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 10 Jan 2011 19:16:25 +0000 (+0100)
Subject: Merge branch 'next' into image-management
X-Git-Tag: beta-freefall-0.6.2-1~137
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=0157d6ead52bd7c3052b368bed7026075be7cb33;hp=-c

Merge branch 'next' into image-management
---

0157d6ead52bd7c3052b368bed7026075be7cb33
diff --combined src/main/resources/templates/insert/sone.xml
index a2c6c09,7d3c8aa..1f12d90
--- a/src/main/resources/templates/insert/sone.xml
+++ b/src/main/resources/templates/insert/sone.xml
@@@ -2,6 -2,7 +2,7 @@@
  <sone>
  
  	<time><% currentSone.time></time>
+ 	<protocol-version>0</protocol-version>
  
  	<client>
  		<name>Sone</name>
@@@ -51,10 -52,4 +52,10 @@@
  		<%/foreach>
  	</reply-likes>
  
 +	<albums>
 +		<%foreach currentSone.albums album>
 +		<%include insert/include/album.xml>
 +		<%/foreach>
 +	</albums>
 +
  </sone>