Merge pull request #99 from pikzen/license-version

author nodiscc <nodiscc@gmail.com>

Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)

committer nodiscc <nodiscc@gmail.com>

Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
author nodiscc <nodiscc@gmail.com>
Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
committer nodiscc <nodiscc@gmail.com>
Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
diff --cc tpl/editlink.html
Simple merge
diff --cc tpl/linklist.html
Simple merge
diff --cc tpl/picwall.html
Simple merge
author	nodiscc <nodiscc@gmail.com>
	Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
committer	nodiscc <nodiscc@gmail.com>
	Mon, 26 Jan 2015 12:41:06 +0000 (13:41 +0100)
		1	2
tpl/editlink.html	patch \|	diff1 \|	diff2 \|	blob \| history
tpl/linklist.html	patch \|	diff1 \|	diff2 \|	blob \| history
tpl/picwall.html	patch \|	diff1 \|	diff2 \|	blob \| history