git.pterodactylus.net Git - Sone.git/commit - src/main/resources/templates/editProfile.html

author	David ‘Bombe’ Roden <bombe@pterodactylus.net>
	Wed, 19 Jan 2011 18:12:40 +0000 (19:12 +0100)
committer	David ‘Bombe’ Roden <bombe@pterodactylus.net>
	Wed, 19 Jan 2011 18:12:40 +0000 (19:12 +0100)
commit	ecf753a31601e558b681daab0598009fe9eec99a
tree	c4409e846a05501d4128ad1bf012d8b10ee9bbc9	tree \| snapshot
parent	92e44c7068d88f23a29a4f82da3b91135c3ef2f2	commit \| diff
parent	0fd7000d91d4bcb417af27b009b546c7b0f38cc0	commit \| diff

Merge branch 'mark-as-read' into next

Conflicts:
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java

Sone – The Social Network plugin for Freenet

src/main/java/net/pterodactylus/sone/template/SoneAccessor.java	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/web/CreatePostPage.java	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/web/DeletePostPage.java	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java	diff1 \|	diff2 \|	blob \| history
src/main/resources/i18n/sone.en.properties	diff1 \|	diff2 \|	blob \| history
src/main/resources/static/css/sone.css	diff1 \|	diff2 \|	blob \| history
src/main/resources/static/javascript/sone.js	diff1 \|	diff2 \|	blob \| history