Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
admin	Add site-wide options to show reblogs and replies in local/public timelines	2019-05-01 22:33:09 +02:00
admin_mailer	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +02:00
application	…
auth	Fix sign up button not saying sign up when invite is used (#10623)	2019-04-23 04:39:21 +02:00
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
following_accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
home	…
invites	…
kaminari	…
layouts	Load custom CSS rules after standard ones	2019-04-22 23:07:27 +02:00
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
remote_follow	…
remote_interaction	…
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
shared	…
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
tags	…
user_mailer	…
well_known	…