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

Browse Source

Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock

...

This commit is contained in:

Thibaut Girka

2019-01-02 13:45:18 +01:00

parent b300948526 66436d0895

commit 571d219bb9

180 changed files with 3933 additions and 3622 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/screen_interactions.svg

File diff suppressed because one or more lines are too long

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 38 KiB After Width:  |  Height:  |  Size: 27 KiB