Merge branch 'master' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

...

This commit is contained in:

Thibaut Girka

2019-06-10 18:30:41 +02:00

parent b45f555a0c 8514ef723c

commit 1b0ff4cd69

192 changed files with 934 additions and 440 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

app/javascript/images/logo_full.svg

File diff suppressed because one or more lines are too long

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.6 KiB