fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-14 18:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
2020-07-22 13:38:17 +02:00
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
mailers Add e-mail-based sign in challenge for users with disabled 2FA (#14013) 2020-06-09 10:23:06 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
policies
presenters Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-07-10 16:51:51 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00