diff options
author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
tree | e6022023d42dde628bb44880659104a87f985039 /spec/fixtures | |
parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) |
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/files/mute-imports.txt | 4 | ||||
-rw-r--r-- | spec/fixtures/files/new-mute-imports.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/spec/fixtures/files/mute-imports.txt b/spec/fixtures/files/mute-imports.txt new file mode 100644 index 000000000..125cbd384 --- /dev/null +++ b/spec/fixtures/files/mute-imports.txt @@ -0,0 +1,4 @@ +bob + +eve@example.com + diff --git a/spec/fixtures/files/new-mute-imports.txt b/spec/fixtures/files/new-mute-imports.txt new file mode 100644 index 000000000..c1c9bca9b --- /dev/null +++ b/spec/fixtures/files/new-mute-imports.txt @@ -0,0 +1,4 @@ +Account address,Hide notifications +bob,true +eve@example.com,false + |