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

Browse Source

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

...

This commit is contained in:

Thibaut Girka

2020-01-24 14:37:06 +01:00

parent a8c109baca 4bae4e972d

commit 9adeaf2bfc

251 changed files with 2910 additions and 770 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/elephant_ui_plane.svg

File diff suppressed because one or more lines are too long

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