luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-15 22:49:44 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01: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-12-10 09:41:49 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00