Merge branch 'message-recipient'
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 27 Nov 2010 15:22:51 +0000 (16:22 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 27 Nov 2010 15:22:51 +0000 (16:22 +0100)
commit6db033602e7c17efc40a4a19efe705d67832fc1a
tree8c110cd3a3f177f9790629bae4a5a20d703c1382
parent776b67999a50184b4214064462f4312f81e7cf78
parent96fcb6d250349cb1c02df44d6e3acdb93c8e7370
Merge branch 'message-recipient'

Conflicts:
src/main/resources/templates/include/viewPost.html
src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
src/main/resources/static/javascript/sone.js
src/main/resources/templates/include/viewPost.html