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

This commit is contained in:
Jeremy Benoist
2017-01-26 13:32:07 +01:00
12 changed files with 31 additions and 25 deletions

View File

@ -30,7 +30,7 @@ framework:
assets: ~
wallabag_core:
version: 2.1.5
version: 2.1.6
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'