diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
| commit | 39643c6b76d92d509b1af0228b6379d7fdce8a1c (patch) | |
| tree | 931dceef7dbc8ae9911d01ded709d558417a6cdd /app/config/tests | |
| parent | 488a468e3e11ff0ab6284afe232bf0f7fa68a8eb (diff) | |
| parent | b88cf91fc8371194df78e690983c61ea94f266cd (diff) | |
| download | wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.gz wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.zst wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.zip | |
Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1
v2 – 1st draft for Pocket import via API & Wallabag v1 import
Diffstat (limited to 'app/config/tests')
| -rw-r--r-- | app/config/tests/parameters.yml.dist.mysql | 3 | ||||
| -rw-r--r-- | app/config/tests/parameters.yml.dist.pgsql | 3 | ||||
| -rw-r--r-- | app/config/tests/parameters.yml.dist.sqlite | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 096ad8c7..88b1d2b4 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql | |||
| @@ -60,3 +60,6 @@ parameters: | |||
| 60 | language: en_US | 60 | language: en_US |
| 61 | from_email: no-reply@wallabag.org | 61 | from_email: no-reply@wallabag.org |
| 62 | rss_limit: 50 | 62 | rss_limit: 50 |
| 63 | |||
| 64 | # pocket import | ||
| 65 | pocket_consumer_key: xxxxxxxx | ||
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index ca3f6ea2..3c61142d 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql | |||
| @@ -60,3 +60,6 @@ parameters: | |||
| 60 | language: en_US | 60 | language: en_US |
| 61 | from_email: no-reply@wallabag.org | 61 | from_email: no-reply@wallabag.org |
| 62 | rss_limit: 50 | 62 | rss_limit: 50 |
| 63 | |||
| 64 | # pocket import | ||
| 65 | pocket_consumer_key: xxxxxxxx | ||
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 92460bcf..2f7699b5 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite | |||
| @@ -60,3 +60,6 @@ parameters: | |||
| 60 | language: en_US | 60 | language: en_US |
| 61 | from_email: no-reply@wallabag.org | 61 | from_email: no-reply@wallabag.org |
| 62 | rss_limit: 50 | 62 | rss_limit: 50 |
| 63 | |||
| 64 | # pocket import | ||
| 65 | pocket_consumer_key: xxxxxxxx | ||