Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.

2020-01-20 18:31:11 +01:00

..

_action_log.html.haml

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

_status.html.haml

Fix admin interface crashing when listing boosts with non-video media attachments (#12907)

2020-01-20 17:39:14 +01:00

index.html.haml

Various fixes and improvements (#12878)

2020-01-20 15:55:03 +01:00

show.html.haml

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

2020-01-12 15:57:34 +01:00