Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
v2	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
web	Sanitize and sandbox toot embeds (#9552)	2018-12-23 02:16:35 +01:00
base_controller.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb