pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.2

Browse Source
This commit is contained in:
Jeremy Benoist
2016-11-03 16:41:29 +01:00
parent da41365579 84795d015b
commit 5a619812ca
60 changed files with 2477 additions and 1936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Resources/config/services.yml
View File

@ -55,6 +55,7 @@ services:
'.fok.nl': 'Googlebot/2.1'
'getpocket.com': 'PHP/5.2'
'iansommerville.com': 'PHP/5.2'
'.slashdot.org': 'PHP/5.2'
calls:
- [ setLogger, [ "@logger" ] ]
tags:
@ -91,7 +92,7 @@ services:
wallabag_core.helper.entries_export:
class: Wallabag\CoreBundle\Helper\EntriesExport
arguments:
- "@craue_config"
- '@=service(''craue_config'').get(''wallabag_url'')'
- src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
wallabag.operator.array.matches: