OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/controllers/api
History
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
 		2018-10-01 12:43:20 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
v2
…
web
…
base_controller.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
oembed_controller.rb
…
push_controller.rb
…
salmon_controller.rb
…
subscriptions_controller.rb
…