Merge branch 'new-web-of-trust' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Mar 2011 17:37:27 +0000 (19:37 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Mar 2011 17:37:27 +0000 (19:37 +0200)
commitc3745c94d79e6fba53c95003287f539b79b2e749
tree0b0e8ba6cd11744ad190d8de0d01d369c66f05ba
parent401a320e6952b63d31f73cff2f9400835a5af2d4
parent9b7ba90c05e6926099fa68e58227bb536068ff8c
Merge branch 'new-web-of-trust' into next
src/main/resources/templates/include/viewPost.html
src/main/resources/templates/include/viewReply.html