Merge branch 'hotfix/deadline_expired_text'

gitflow-hotfix-stash: deadline_expired_text
2021-06-15 11:33:29 +02:00 · 2021-06-15 11:32:14 +02:00
2 changed files with 2 additions and 2 deletions
--- a/server/scripts/onRegattaClicked.js
+++ b/server/scripts/onRegattaClicked.js
@@ -187,7 +187,7 @@ async function onRegattaClicked(id) {
 					$('#badge-regatta-meldung').addClass('bg-highlight').removeClass('bg-green2-dark bg-red2-dark bg-yellow2-dark');
 				}
 			} else {
-				$('#badge-regatta-meldung').text('Meldeschluss abgelaufen');
+				$('#badge-regatta-meldung').text('Meldeschluss abgelaufen, Nachmeldung möglich');
 				$('#badge-regatta-meldung').addClass('bg-highlight').removeClass('bg-green2-dark bg-red2-dark bg-yellow2-dark');
 			}
 		} else {
--- a/server/version.php
+++ b/server/version.php
@@ -1,5 +1,5 @@
 <?php

-	define('PWA_VERSION', '1.11.5h1');
+	define('PWA_VERSION', '1.11.5h2');

 ?>
Author	SHA1	Message	Date
ostertun	2f2d94bab4	Merge branch 'hotfix/deadline_expired_text'	2021-06-15 11:33:29 +02:00
ostertun	c91dc57736	gitflow-hotfix-stash: deadline_expired_text	2021-06-15 11:32:14 +02:00