You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		7 years ago
..
activitypub	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
concerns	Admission-based registrations mode (#10250)	7 years ago
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
well_known	…
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
application_controller.rb	…
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
public_timelines_controller.rb	[Glitch] Redesign landing page	7 years ago
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	…
stream_entries_controller.rb	…
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago