diff development.ini @ 8568:a04d6926d694

merge stable
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Wed, 17 Jun 2020 21:52:16 +0200
parents 8cd0c12758e6
children ff8651b2f14f
line wrap: on
line diff
--- a/development.ini	Thu Jun 11 21:07:24 2020 +0200
+++ b/development.ini	Wed Jun 17 21:52:16 2020 +0200
@@ -362,6 +362,7 @@
 sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60
 #sqlalchemy.url = postgresql://user:pass@localhost/kallithea
 #sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
+## Note: the mysql:// prefix should also be used for MariaDB
 
 sqlalchemy.pool_recycle = 3600