diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-21 10:17:38 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-21 10:17:38 +0200 |
commit | 2f3af70e1ae6f9dd403e87d232ddf5315e34e430 (patch) | |
tree | 796aecadeab07b7c3ac2dd72bea69c9ca5dcc8e1 /tests/Wallabag/ImportBundle/fixtures | |
parent | b6d72e0c91be648208f8ee881876b11684c3247d (diff) | |
parent | 759c91940b9c97fdbd21a729c707ad686ded1202 (diff) | |
download | wallabag-2f3af70e1ae6f9dd403e87d232ddf5315e34e430.tar.gz wallabag-2f3af70e1ae6f9dd403e87d232ddf5315e34e430.tar.zst wallabag-2f3af70e1ae6f9dd403e87d232ddf5315e34e430.zip |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'tests/Wallabag/ImportBundle/fixtures')
-rw-r--r-- | tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv | 2 | ||||
-rw-r--r-- | tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv b/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv index 7b692d00..5380bf2c 100644 --- a/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv +++ b/tests/Wallabag/ImportBundle/fixtures/instapaper-export.csv | |||
@@ -1,5 +1,5 @@ | |||
1 | URL,Title,Selection,Folder | 1 | URL,Title,Selection,Folder |
2 | http://www.liberation.fr/societe/2012/12/06/baumettes-un-tour-en-cellule_865551,Baumettes : un tour en cellule,,Unread | 2 | https://www.liberation.fr/societe/2012/12/06/baumettes-un-tour-en-cellule_865551,Baumettes : un tour en cellule,,Unread |
3 | https://redditblog.com/2016/09/20/amp-and-reactredux/,AMP and React+Redux: Why Not?,,Archive | 3 | https://redditblog.com/2016/09/20/amp-and-reactredux/,AMP and React+Redux: Why Not?,,Archive |
4 | https://medium.com/@the_minh/why-foursquare-swarm-is-still-my-favourite-social-network-e38228493e6c,Why Foursquare / Swarm is still my favourite social network,,Starred | 4 | https://medium.com/@the_minh/why-foursquare-swarm-is-still-my-favourite-social-network-e38228493e6c,Why Foursquare / Swarm is still my favourite social network,,Starred |
5 | https://www.20minutes.fr/high-tech/2077615-20170531-quoi-exactement-tweet-covfefe-donald-trump-persiste-signe,"Dis donc Donald Trump, c'est quoi exactement «covfefe»?",,test_tag | 5 | https://www.20minutes.fr/high-tech/2077615-20170531-quoi-exactement-tweet-covfefe-donald-trump-persiste-signe,"Dis donc Donald Trump, c'est quoi exactement «covfefe»?",,test_tag |
diff --git a/tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json b/tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json index 63c44cf9..a2142f90 100644 --- a/tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json +++ b/tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json | |||
@@ -21,7 +21,7 @@ | |||
21 | { | 21 | { |
22 | "id": 22, | 22 | "id": 22, |
23 | "title": "Réfugiés: l'UE va créer 100 000 places d'accueil dans les Balkans", | 23 | "title": "Réfugiés: l'UE va créer 100 000 places d'accueil dans les Balkans", |
24 | "url": "http://www.liberation.fr/planete/2015/10/26/refugies-l-ue-va-creer-100-000-places-d-accueil-dans-les-balkans_1408867", | 24 | "url": "https://www.liberation.fr/planete/2015/10/26/refugies-l-ue-va-creer-100-000-places-d-accueil-dans-les-balkans_1408867", |
25 | "is_archived": false, | 25 | "is_archived": false, |
26 | "created_at": "2016-09-08T11:55:58+0200", | 26 | "created_at": "2016-09-08T11:55:58+0200", |
27 | "updated_at": "2016-09-08T11:57:16+0200", | 27 | "updated_at": "2016-09-08T11:57:16+0200", |