Merge branch 'master' into release_2_5

This commit is contained in:
Grigory Smolkin
2020-12-09 13:27:27 +03:00
34 changed files with 1995 additions and 565 deletions
+5 -1
View File
@@ -1 +1,5 @@
pg_probackup 2.5.0
<<<<<<< HEAD
pg_probackup 2.5.0
=======
pg_probackup 2.4.8
>>>>>>> master