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

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		7 years ago
..
about	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
accounts	…
admin	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
admin_mailer	…
application	…
auth	…
authorize_follows	…
errors	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	…
settings	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
shared	…
shares	…
stream_entries	…
tags	…
user_mailer	…
well_known	…