Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
accounts	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
admin_mailer
application
auth	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
errors
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts
following_accounts
home
invites	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
kaminari	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
media
notification_mailer
oauth	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
remote_follow
remote_interaction
remote_unfollows
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +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-09-01 17:23:46 +02:00
tags
user_mailer
well_known