fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-16 19:55:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1/statuses
History
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +02:00
..
bookmarks_controller.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02:00
favourited_by_accounts_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
favourites_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
mutes_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
pins_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reblogged_by_accounts_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reblogs_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00