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
..
bug_report.md	Adapt github issue template to glitch-soc	2018-08-19 16:56:42 +02:00
config.yml	Add config for issue template (#12306)	2019-11-13 22:51:49 +01:00
feature_request.md	Fix feature request issue template	2018-10-16 03:02:01 +02:00
support.md	Update issue templates (#8989)	2018-10-16 03:01:07 +02:00