diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-04 14:53:52 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-04 14:53:52 +0200 |
| commit | 1682ac571763f473da54074b0608cd9ccb4b9ae5 (patch) | |
| tree | 2cb3f134660b2d7d460772966f7eb595395611f7 /spec/fixtures/files | |
| parent | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff) | |
| parent | 26bd9fa508ac155f996c2c0d9753a27d46158749 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.
Diffstat (limited to 'spec/fixtures/files')
| -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 + |