Merge pull request #3275 from OpenShot/merge-master-to-develop1

Merge master into develop (and bump version to -dev2)

Author: jonoomph

src/classes/info.py

@@ -29,7 +29,7 @@
 
 from PyQt5.QtCore import QDir
 
-VERSION = "2.5.1-dev1"
+VERSION = "2.5.1-dev2"
 MINIMUM_LIBOPENSHOT_VERSION = "0.2.5"
 DATE = "20200228000000"
 NAME = "openshot-qt"