projects / Sone.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 601d1b0 1d3da26)
Merge branch 'last-working' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 12 Jun 2015 18:47:55 +0000 (20:47 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 12 Jun 2015 21:01:04 +0000 (23:01 +0200)
commitf229fe41f708d2b275c20ceb9aba5993761218a3
treec7ae0041fbe7890f92db77ada33e995f488c49c4tree | snapshot
parent601d1b020d8f5feccda4c2bbe78df2b9f336f0cccommit | diff
parent1d3da2623a113f74f76422030af040a0abc9c3d7commit | diff
Merge branch 'last-working' into next

This is the current state with lots and lots of changes since the last
release. I have been using this state during the last year and it should
work pretty much the same as before (minus a couple of bugs).

Conflicts:
src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
src/main/java/net/pterodactylus/sone/freenet/PluginStoreConfigurationBackend.java
pom.xml diff1 | diff2 | blob | history
src/main/java/net/pterodactylus/sone/core/FreenetInterface.java diff1 | diff2 | blob | history
src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java | diff2 | blob | history
src/main/java/net/pterodactylus/sone/core/SoneInserter.java diff1 | diff2 | blob | history
src/main/java/net/pterodactylus/sone/freenet/PluginStoreConfigurationBackend.java diff1 | diff2 | blob | history
src/main/java/net/pterodactylus/sone/main/SonePlugin.java diff1 | diff2 | blob | history
src/test/java/net/pterodactylus/sone/core/FreenetInterfaceTest.java | diff2 | blob | history
src/test/java/net/pterodactylus/sone/core/SoneInserterTest.java | diff2 | blob | history
src/test/java/net/pterodactylus/sone/core/UpdateCheckerTest.java | diff2 | blob | history
Sone – The Social Network plugin for Freenet