Merge pull request #389 from alcaeus/merge-2.2-3.0

Merge 2.2.x into 3.0.x

Author: alcaeus

.doctrine-project.json

@@ -5,7 +5,7 @@
   "versions": [
     {
       "name": "3.1",
-      "branchName": "master",
+      "branchName": "3.1.x",
       "slug": "3.1",
       "upcoming": true
     },

Resources/doc/index.rst

@@ -67,7 +67,6 @@ application:
                 version_column_name: 'version'
                 version_column_length: 1024
                 executed_at_column_name: 'executed_at'
-                execution_time_column_name: 'execution_time'
 
         # Possible values: "BY_YEAR", "BY_YEAR_AND_MONTH", false
         organize_migrations: false