mastodon/app
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
..
chewy Fix bookmarks also searchable (#13293) 2020-03-22 02:40:03 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00