luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-17 10:55:54 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 9c34090db8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
2020-10-26 15:48:16 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-10-26 15:48:16 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-10-26 15:48:16 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00