oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Benoist 2016-10-24 12:03:17 +02:00
commit 64a8781e45
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
82 changed files with 654 additions and 1569 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/config/config.yml
View file

@ -30,7 +30,7 @@ framework:
assets: ~
wallabag_core:
version: 2.1.2-dev
version: 2.1.3-dev
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'
@ -50,6 +50,7 @@ wallabag_core:
rss_limit: 50
reading_speed: 1
cache_lifetime: 10
fetching_error_message: "wallabag can't retrieve contents for this article. Please report this issue to us."
wallabag_user:
registration_enabled: "%fosuser_registration%"