From ecfd689a2c2f2244454df1cf29c7305957d8be88 Mon Sep 17 00:00:00 2001
From: dschousef <dschousef@gmail.com>
Date: Wed, 27 Jan 2021 16:05:09 +0100
Subject: [PATCH 1/3] Grammatikfehler korrigiert

---
 data/res/i18n/de-DE/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/res/i18n/de-DE/user.php b/data/res/i18n/de-DE/user.php
index 45ecb780..eaf04fdd 100644
--- a/data/res/i18n/de-DE/user.php
+++ b/data/res/i18n/de-DE/user.php
@@ -25,7 +25,7 @@
     'Your token to reset your password is invalid or expired. Please request a new email.'
         => 'Der Code zum Ändern Ihres Passwortes ist ungültig oder abgelaufen. Bitte lassen Sie sich eine neue E-Mail zusenden.',
     'All right, your password has been changed. You can now log into your account.'
-        => 'In Ordnung, Ihr Passwort wurde geändert. Sie können Sie nun wieder anmelden.',
+        => 'In Ordnung, Ihr Passwort wurde geändert. Sie können sich nun wieder anmelden.',
 
     'New registration waiting for activation' => 'Neuer Benutzer wartet auf Aktivierung',
     'A new user has registered to your %s. According to your configuration, this user will not be able to book %s until you manually activate him.'

From 00bef42a962bb07fbfc710bde702758ab16b5d8d Mon Sep 17 00:00:00 2001
From: Gerald Buchgraber <gerald.buchgraber@gmail.com>
Date: Wed, 31 Mar 2021 11:38:33 +0200
Subject: [PATCH 2/3] Update composer.json

Fix for issue #461
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bb3ed19e..00bd0926 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
     "require": {
         "php": ">=5.6 <=7.4.14",
         "ext-intl": "*",
-        "zendframework/zendframework": "^2.5.3"
+        "zendframework/zendframework": "^2.5.3",
+        "symfony/polyfill-php71": "^1.19"
     },
 
     "autoload": {

From e4ffdaaa309b162575996de79d5a91e438bba25a Mon Sep 17 00:00:00 2001
From: Karim <37943746+ksaadDE@users.noreply.github.com>
Date: Wed, 1 Sep 2021 21:19:00 +0000
Subject: [PATCH 3/3] http2?

http2?
don't forget to remind that the SSL cert.pem and key.pem need to be linked :p
---
 nginx/conf.d/booking.example.com.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/conf.d/booking.example.com.conf b/nginx/conf.d/booking.example.com.conf
index cd8aaed6..42465a0f 100644
--- a/nginx/conf.d/booking.example.com.conf
+++ b/nginx/conf.d/booking.example.com.conf
@@ -1,6 +1,6 @@
 server {
 	server_name booking.example.com;
-	listen 443 ssl;
+	listen 443 http2;
 
 	#SSL parameters in extra file
 	include /etc/acme-sh/options-ssl-nginx.conf;