Jeremy Benoist b878be4cc9 Merge remote-tracking branch 'origin/master' into 2.4 ... # Conflicts: # web/wallassets/baggy.js # web/wallassets/manifest.json # web/wallassets/material.css # web/wallassets/material.js		2018-11-25 09:58:18 +01:00
..
capistrano	Updated Capistrano configuration	2016-10-29 14:39:07 +02:00
tests	Add custom driver & schema manager for PostgreSQL 10	2017-12-12 12:14:40 +01:00
webpack	Remove fixed relative path for assets	2017-12-20 21:53:48 +01:00
config.yml	Add secure email	2018-10-11 07:57:11 +02:00
config_dev.yml	Replace kernel.root_dir by kernel.project_dir	2017-10-14 00:32:56 +02:00
config_prod.yml	Replace kernel.root_dir by kernel.project_dir	2017-10-14 00:32:56 +02:00
config_test.yml	Jump to Symfony 3.4	2018-10-04 14:11:57 +02:00
parameters.yml.dist	Add secure email	2018-10-11 07:57:11 +02:00
parameters_test.yml	Add missing parameter for test	2017-12-18 13:29:33 +01:00
routing.yml	Fix tests & deprecation notice	2016-12-15 21:38:16 +01:00
routing_dev.yml	Remove useless spaces	2016-06-24 11:28:07 +02:00
routing_rest.yml	ApiDoc & Route annotation were conflicted	2016-10-15 16:46:42 +02:00
security.yml	Added possibility to change locale from login/register pages	2018-10-13 09:39:00 +02:00
services.yml	Jump to Symfony 3.4	2018-10-04 14:11:57 +02:00
services_test.yml	Jump to Symfony 3.4	2018-10-04 14:11:57 +02:00
wallabag.yml	Prepare 2.3.4 release	2018-11-23 08:34:13 +01:00