Pull from tx

2018-04-06 23:14:40 +00:00
parent eb175f5542
commit db72f87b34
131 changed files with 80974 additions and 77255 deletions
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@ -18,7 +18,7 @@ public class RouterVersion {
    /** deprecated */
    public final static String ID = "Monotone";
    public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 25;
+    public final static long BUILD = 26;

    /** for example "-test" */
    public final static String EXTRA = "-rc";