projects / Sone.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: f4ea1e1)
Merge branch 'edit-wot-trust' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 20:30:26 +0000 (21:30 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 20:30:26 +0000 (21:30 +0100)
Conflicts:
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/web/OptionsPage.java
src/main/java/net/pterodactylus/sone/web/WebInterface.java


No differences found
Sone – The Social Network plugin for Freenet