Daniel Lee 1cef373d16 Merge remote-tracking branch 'upstream/master' into update-xorm

2018-03-20 19:21:58 +01:00

..

provisioning

provisioning: dont ignore sample yaml files

2018-02-20 08:40:37 +01:00

defaults.ini

database: expose SetConnMaxLifetime as config setting

2018-03-16 01:09:00 +01:00

ldap.toml

Update ldap.toml

2018-02-15 10:41:15 -08:00

sample.ini

Merge remote-tracking branch 'upstream/master' into update-xorm

2018-03-20 19:21:58 +01:00