Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
accounts	Improve account media query (#10121)	2019-02-26 15:23:24 +01:00
apps	Add vapid_key to the application entity in the REST API (#10058)	2019-02-16 05:27:05 +01:00
instances
lists
polls	Add polls (#10111)	2019-03-03 22:18:23 +01:00
push
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
timelines
accounts_controller.rb	Add locale param to sign-up API (#9747)	2019-01-07 14:50:20 +01:00
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb	Add cache to custom emojis API (#9732)	2019-01-06 23:52:58 +01: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
polls_controller.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
reports_controller.rb
scheduled_statuses_controller.rb
search_controller.rb	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
statuses_controller.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
streaming_controller.rb
suggestions_controller.rb