[Lada-commits] [PATCH 1 of 2] Prepare tag

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1488192968 -3600
# Branch release-2.5
# Node ID a347cb704f93f43f8bc2b66298854dc715085058
# Parent  3f499c52eee649b47c89b7fe8523177198537e91
Prepare tag.

This release includes bugfixes and small improvements to the client.
This release is served best with server version 2.5.

diff -r 3f499c52eee6 -r a347cb704f93 app.js
--- a/app.js	Thu Feb 23 12:49:28 2017 +0100
+++ b/app.js	Mon Feb 27 11:56:08 2017 +0100
@@ -89,7 +89,7 @@
         Lada.logintime = '';
         Lada.mst = [];
         Lada.netzbetreiber = [];
-        Lada.clientVersion = '2.6-SNAPSHOT';
+        Lada.clientVersion = '2.5.1';
         Lada.serverVersion = '';
 
         var queryString = document.location.href.split('?')[1];
diff -r 3f499c52eee6 -r a347cb704f93 custom-vhosts.conf
--- a/custom-vhosts.conf	Thu Feb 23 12:49:28 2017 +0100
+++ b/custom-vhosts.conf	Mon Feb 27 11:56:08 2017 +0100
@@ -21,7 +21,7 @@
 Listen 83
 Listen 84
 
-Define LADA_SERVER_VERSION 2.6-SNAPSHOT
+Define LADA_SERVER_VERSION 2.5
 
 <VirtualHost *:80>
     ServerAdmin webmaster at localhost