diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-20 15:11:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 15:11:43 +0100 |
| commit | 24696458bf22c8529b49f89b2791e3e07583b7e0 (patch) | |
| tree | 65e4711917b343a38c6e9f498f8d36e71dcde7c4 /spec/fixtures/files/bookmark-imports.txt | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
| parent | 3281c9b4c0935a9296e0ea5f359243d732605832 (diff) | |
Merge pull request #1467 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/fixtures/files/bookmark-imports.txt')
| -rw-r--r-- | spec/fixtures/files/bookmark-imports.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/fixtures/files/bookmark-imports.txt b/spec/fixtures/files/bookmark-imports.txt new file mode 100644 index 000000000..7cc8901a0 --- /dev/null +++ b/spec/fixtures/files/bookmark-imports.txt @@ -0,0 +1,4 @@ +https://example.com/statuses/1312 +https://local.com/users/foo/statuses/42 +https://unknown-remote.com/users/bar/statuses/1 +https://example.com/statuses/direct |