Merge branch 'master' into simon/bisq-dashboard

# Conflicts: # frontend/src/locale/messages.xlf
2021-04-26 01:41:07 +04:00
parent 001bddd529 3ead05fa51
commit 3a957ece05
35 changed files with 10601 additions and 9006 deletions
--- a/production/nginx.conf
+++ b/production/nginx.conf
@@ -102,6 +102,7 @@ http {
 	        ~*^nl nl;
 	        ~*^ja ja;
 	        ~*^nb nb;
+	        ~*^pl pl;
 	        ~*^pt pt;
 	        ~*^sl sl;
 	        ~*^fi fi;
@@ -130,6 +131,7 @@ http {
 	        ~*^nl nl;
 	        ~*^ja ja;
 	        ~*^nb nb;
+	        ~*^pl pl;
 	        ~*^pt pt;
 	        ~*^sl sl;
 	        ~*^fi fi;