luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 2cfa142961 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.
2020-08-01 20:24:23 +02:00
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Fix local-only toots not being returned by the local TL API 2020-07-25 13:25:58 +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-08-01 20:24:23 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-08-01 20:24:23 +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-08-01 20:24:23 +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