mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +02:00

2019-09-30 12:23:57 +02:00

2019-09-29 21:31:51 +02:00

2019-09-30 12:23:57 +02:00

2019-09-19 13:24:50 +02:00

2018-08-23 21:44:27 +02:00

initial_state_serializer.rb

2019-08-19 21:49:35 +02:00

manifest_serializer.rb

2019-09-05 15:51:51 +02:00

oembed_serializer.rb

2019-03-25 15:01:09 +01:00

webfinger_serializer.rb

2019-08-01 19:14:02 +02:00