luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-17 15:39:16 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
paperclip Fix ruby 2.7 warnings about keyword parameters (#12824) 2020-01-11 21:38:02 +01:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
templates
cli.rb Close registration before self-destruct (#12877) 2020-01-21 18:56:18 +01:00