luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-31 09:36:57 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers
History
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
..
activitypub Federated reports (#6570) 2018-02-28 06:54:55 +01:00
rest Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
web Fix WebPush (regression from #4524) (#4778) 2017-09-02 16:50:42 +02:00
initial_state_serializer.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
manifest_serializer.rb implement web share target (#6278) 2018-01-17 17:08:10 +01:00
oembed_serializer.rb Clean up and improve generated OpenGraph tags (#4901) 2017-09-12 05:39:38 +02:00
webfinger_serializer.rb Remove rabl dependency (#5894) 2017-12-06 15:04:49 +09:00