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.

David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
about	…
accounts	…
admin	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
admin_mailer	…
application	…
auth	…
authorize_follows	…
errors	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
notification_mailer	…
oauth	…
remote_follow	…
settings	…
shared	…
shares	…
stream_entries	…
tags	…
user_mailer	…
well_known	…