projects / Sone.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ba5d15 cd1a52c)
Merge branch 'next' into image-management
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 22 Mar 2011 18:46:01 +0000 (19:46 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 22 Mar 2011 18:46:01 +0000 (19:46 +0100)
commit33f333b35a73d3d4a4e79f41e9dd7b342db87b1a
treefa0af112c26934a816ac13a83d7cd29b360131c3tree | snapshot
parent8ba5d1597f31ae4cf93969489a98cadfc2304971commit | diff
parentcd1a52cf4426d23240d59be0a433d8f1763f2911commit | diff
Merge branch 'next' into image-management

Conflicts:
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/data/Sone.java
src/main/java/net/pterodactylus/sone/web/WebInterface.java
src/main/resources/i18n/sone.en.properties
src/main/java/net/pterodactylus/sone/core/Core.java diff1 | diff2 | blob | history
src/main/java/net/pterodactylus/sone/data/Sone.java diff1 | diff2 | blob | history
src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java diff1 | | blob | history
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java diff1 | | blob | history
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java diff1 | | blob | history
src/main/java/net/pterodactylus/sone/web/WebInterface.java diff1 | diff2 | blob | history
src/main/resources/i18n/sone.en.properties diff1 | diff2 | blob | history
src/main/resources/static/javascript/sone.js diff1 | diff2 | blob | history
src/main/resources/templates/insert/sone.xml diff1 | diff2 | blob | history
Sone – The Social Network plugin for Freenet