luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.
2020-07-01 19:23:14 +02:00
..
chewy Fix searchable status without explicitly mentioning it (#13829) 2020-05-23 05:47:25 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +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-01 19:23:14 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +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-01 19:23:14 +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-06-30 23:00:20 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +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-01 19:23:14 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00