Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		2019-04-08 15:57:56 +02:00
..
accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02: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	Fix 404 for GET /api/v1/push/subscription (#7472)	2018-05-13 21:45:18 +02:00
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
timelines	Fix `tagged` param not being normalized before querying tags (#10249)	2019-03-13 13:02:13 +01:00
accounts_controller.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02: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
preferences_controller.rb	Add a preferences API so apps can share basic behaviours (#10109)	2019-03-15 02:39:20 +01:00
reports_controller.rb	…
scheduled_statuses_controller.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
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	…