Merge branch '2.x'

davidism · davidism · commit 3d3261f4fc6d · 2019-04-24T13:27:46.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ cache:
 branches:
   only:
     - master
-    - /^.*-maintenance$/
+    - /^\d+(\.\d+)*(\.x)?$/
 
 notifications:
   email: false
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,7 +7,7 @@ Unreleased
 Version 2.4.0
 -------------
 
-Released 2019-04-23
+Released 2019-04-24
 
 -   Make engine configuration more flexible. (:pr:`684`)
 -   Address SQLAlchemy 1.3 deprecations. (:pr:`684`)
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
     "flask": ("http://flask.pocoo.org/docs/", None),
     "sqlalchemy": ("https://docs.sqlalchemy.org/en/latest/", None),
 }
-issues_github_path = "pallets/werkzeug"
+issues_github_path = "pallets/flask-sqlalchemy"
 
 # HTML -----------------------------------------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"flask": ("http://flask.pocoo.org/docs/", None),`
`23`	`23`	`"sqlalchemy": ("https://docs.sqlalchemy.org/en/latest/", None),`
`24`	`24`	`}`
`25`		`-issues_github_path = "pallets/werkzeug"`
	`25`	`+issues_github_path = "pallets/flask-sqlalchemy"`
`26`	`26`
`27`	`27`	`# HTML -----------------------------------------------------------------`
`28`	`28`