diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
| commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
| tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /README.md | |
| parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
| parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
| download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -13,7 +13,7 @@ If you do not have your own server, consider [the wallabag.it hosting solution]( | |||
| 13 |  | 13 |  |
| 14 | 14 | ||
| 15 | # Install wallabag | 15 | # Install wallabag |
| 16 | Please read [the documentation to see the wallabag requirements](http://doc.wallabag.org/en/master/user/installation.html#requirements). | 16 | Please read [the documentation to see the wallabag requirements](https://doc.wallabag.org/en/admin/installation/requirements.html). |
| 17 | 17 | ||
| 18 | Then you can install wallabag by executing the following commands: | 18 | Then you can install wallabag by executing the following commands: |
| 19 | 19 | ||