about summary refs log tree commit diff
path: root/spec/fixtures/files
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-11-24 12:27:15 -0600
committerFire Demon <firedemon@creature.cafe>2020-11-24 12:27:15 -0600
commit69fa4f7d4f3c435018c1e7cb9e6a0fcb5b233695 (patch)
treeffbd8bc1e5c820fce33624874088863c43460299 /spec/fixtures/files
parent90b33ab8af91991217cdce3e2d9163756e58a691 (diff)
parent24696458bf22c8529b49f89b2791e3e07583b7e0 (diff)
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'spec/fixtures/files')
-rw-r--r--spec/fixtures/files/bookmark-imports.txt4
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