Glitch-Shrike/lib
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
paperclip Add customizable thumbnails for audio and video attachments (#14145) 2020-06-29 13:56:55 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
templates
cli.rb Fix help text around `tootctl email_domain_blocks` (#14147) 2020-06-26 21:28:40 +02:00