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 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
assets
chewy/strategy
devise
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
paperclip Fix Paperclip using deprecated URI.escape function (#13320) 2020-03-26 15:09:16 +01:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-02-29 12:20:54 +01:00
templates
cli.rb Close registration before self-destruct (#12877) 2020-01-21 18:56:18 +01:00