Thibaut Girka ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		2019-11-20 15:36:09 +01:00
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
admin	…
apps	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	…
accounts_controller_spec.rb	…
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	…
conversations_controller_spec.rb	…
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
endorsements_controller_spec.rb	…
favourites_controller_spec.rb	…
filters_controller_spec.rb	…
follow_requests_controller_spec.rb	…
instances_controller_spec.rb	…
lists_controller_spec.rb	…
markers_controller_spec.rb	…
media_controller_spec.rb	…
mutes_controller_spec.rb	…
notifications_controller_spec.rb	…
polls_controller_spec.rb	…
reports_controller_spec.rb	…
statuses_controller_spec.rb	…
streaming_controller_spec.rb	…
suggestions_controller_spec.rb	…