Mastodon

Files

T

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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

2018-05-29 02:01:24 +02:00

account_serializer.rb

2018-06-16 18:47:19 +02:00

application_serializer.rb

…

context_serializer.rb

…

credential_account_serializer.rb

2018-06-17 18:57:31 +02:00

custom_emoji_serializer.rb

…

instance_serializer.rb

2018-03-09 00:17:17 +00:00

list_serializer.rb

…

media_attachment_serializer.rb

…

mute_serializer.rb

…

notification_serializer.rb

…

preview_card_serializer.rb

2017-12-07 03:37:43 +01:00

relationship_serializer.rb

…

report_serializer.rb

…

search_serializer.rb

…

status_serializer.rb

2018-04-11 20:40:29 +02:00

tag_serializer.rb

2018-05-27 21:45:30 +02:00

web_push_subscription_serializer.rb

2018-05-11 11:49:12 +02:00