diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
| commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
| tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /app/config/routing_dev.yml | |
| parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
| parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
| download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'app/config/routing_dev.yml')
| -rw-r--r-- | app/config/routing_dev.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 404f6a3b..95c1b026 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | _wdt: | 1 | _wdt: |
| 2 | resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" | 2 | resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" |
| 3 | prefix: /_wdt | 3 | prefix: /_wdt |
| 4 | 4 | ||
| 5 | _profiler: | 5 | _profiler: |
| 6 | resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" | 6 | resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" |
| 7 | prefix: /_profiler | 7 | prefix: /_profiler |
| 8 | 8 | ||
| 9 | _errors: | 9 | _errors: |
| 10 | resource: "@TwigBundle/Resources/config/routing/errors.xml" | 10 | resource: "@TwigBundle/Resources/config/routing/errors.xml" |
| 11 | prefix: /_error | 11 | prefix: /_error |
| 12 | 12 | ||
| 13 | _main: | 13 | _main: |
| 14 | resource: routing.yml | 14 | resource: routing.yml |