Merge branch 'v2_5_0'

Dockerfile

-FROM tomcat:9-jre8
+FROM tomcat:9-jdk11
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY build/2.4.5/BudgetMaster-v2.4.5.war $CATALINA_HOME/webapps/ROOT.war
+COPY build/2.5.0/BudgetMaster-v2.5.0.war $CATALINA_HOME/webapps/ROOT.war
 COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 
 EXPOSE 8080
\ No newline at end of file

README.md

@@ -2,7 +2,7 @@
 Manage your monthly budget easily with BudgetMaster
 
 - __start:__ 17.12.16
-- __current release:__ v2.4.5 (28) from 19.08.20
+- __current release:__ v2.5.0 (29) from 03.12.20
 
 ## Key Features
 - Keep your data private - Host your own BudgetMaster server or use it in standalone mode. All data remains on your machines.
@@ -16,7 +16,7 @@ Manage your monthly budget easily with BudgetMaster
 - Password protected website - Your data can only be accessed by entering the correct password. (Note: The database is not encrypted)
 - Localization - English and German supported.
 - Search and Filter - Search for individual transactions or filter your view.
-- Visualize your data - Use on of the pre-defined charts or create your one by using the chart framework to visualize and analyze your data.
+- Visualize your data - Use one of the pre-defined charts or create your one by using the chart framework to visualize and analyze your data.
 - Auto Backup - Schedule an automatic export of your database content.
 
 ## Available Languages

build/logo/Font.txt

-League Gothic
\ No newline at end of file