Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.		2019-03-11 11:23:50 +01:00
..
exports
two_factor_authentication
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-11 11:23:50 +01:00
featured_tags_controller.rb
flavours_controller.rb
follower_domains_controller.rb
imports_controller.rb
migrations_controller.rb
notifications_controller.rb
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb