This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
about	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
accounts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
admin	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
admin_mailer	…
application	…
auth	Add contact e-mail hint to 2FA login form (#7376)	2018-05-06 10:52:36 +02:00
authorize_follows	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
errors	…
follower_accounts	Add preference to hide following/followers lists (#7532)	2018-05-18 02:26:51 +02:00
following_accounts	Add preference to hide following/followers lists (#7532)	2018-05-18 02:26:51 +02:00
home	…
invites	…
kaminari	…
layouts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_unfollows	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
shared	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
shares	…
stream_entries	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
tags	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
user_mailer	…
well_known	…