fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 07:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/serializers
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
activitypub Revert #5772 (#6221) 2018-01-08 10:57:52 +01:00
rest Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00: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-02-09 09:25:53 -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