Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
accounts	Inactive header in main profile to match column. (#8520)	2018-08-30 23:53:30 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-28 17:24:39 +02:00
admin_mailer
application	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
auth	When registrations closed, link "Sign up" to joinmastodon.org (#8395)	2018-08-23 19:11:41 +02:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
errors
filters	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +02:00
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	Add autofollow option to invites (#7805)	2018-06-15 18:00:23 +02:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
media
notification_mailer
oauth
remote_follow	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
remote_interaction	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_unfollows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +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-31 19:10:57 +02:00
tags	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
user_mailer
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00