diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-05-29 11:41:07 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-05-29 11:41:07 +0200 |
| commit | 6546aca4a3a54ec61c3b43e84aa948efb1aeca95 (patch) | |
| tree | da21bd96caa6eb74c6aae94bb876a22d0ea1ea8e /app | |
| parent | 73ec68b1ffafb792265a3805833e5cd84c966aed (diff) | |
| download | wallabag-6546aca4a3a54ec61c3b43e84aa948efb1aeca95.tar.gz wallabag-6546aca4a3a54ec61c3b43e84aa948efb1aeca95.tar.zst wallabag-6546aca4a3a54ec61c3b43e84aa948efb1aeca95.zip | |
Keep composer.lock
We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too.
Now we have less contributions (sadly) so I think we won't run against that problem.
Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install.
It'll also be much easier to make release.
Scrutinizer & Travis will be faster too.
Diffstat (limited to 'app')
| -rw-r--r-- | app/config/wallabag.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 99088a6f..ea1cce12 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | wallabag_core: | 1 | wallabag_core: |
| 2 | version: 2.3.8 | 2 | version: 2.4.0-dev |
| 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
| 4 | languages: | 4 | languages: |
| 5 | en: 'English' | 5 | en: 'English' |