Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml		2018-08-01 22:20:25 +02:00
..
about	…
accounts	Drop glitch-style account bio fields	2018-07-31 16:26:36 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02:00
admin_mailer	…
application	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
auth	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
authorize_follows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
errors	…
filters	…
follower_accounts	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
following_accounts	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
media	…
notification_mailer	…
oauth	…
remote_follow	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
remote_unfollows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
settings	Delete leftovers from keyword_mutes	2018-08-01 16:49:27 +02:00
shared	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
tags	…
user_mailer	…
well_known	…