Thibaut Girka 3922b518f7 Merge branch 'master' into glitch-soc/merge-upstream		2019-06-28 21:36:50 +02:00
..
accounts
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
apps
instances
lists
polls
push	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
statuses
timelines	Use a redis-cached feed for the DM timeline	2019-06-27 16:44:12 +02:00
accounts_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
filters_controller.rb
follow_requests_controller.rb
follows_controller.rb
instances_controller.rb
lists_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
polls_controller.rb	Fix poll API not requiring authentication on non-public polls (#10960)	2019-06-04 20:10:26 +02:00
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
search_controller.rb
statuses_controller.rb	Add API support for setting status content-type	2019-05-17 23:51:14 +02:00
streaming_controller.rb
suggestions_controller.rb