diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
| commit | f5f6d23d554b3a81020feebc65188cc64f644095 (patch) | |
| tree | b30197858c2018a32be559f5b4b479571c75dee3 /spec/fixtures/files/new-following-imports.txt | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 3f036ac6b8f9919b3b141012db163476f18fe299 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
Diffstat (limited to 'spec/fixtures/files/new-following-imports.txt')
| -rw-r--r-- | spec/fixtures/files/new-following-imports.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/fixtures/files/new-following-imports.txt b/spec/fixtures/files/new-following-imports.txt new file mode 100644 index 000000000..5ea6c7346 --- /dev/null +++ b/spec/fixtures/files/new-following-imports.txt @@ -0,0 +1,4 @@ +Account address,Show boosts +bob,true +eve@example.com,false + |