Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
accounts
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
admin_mailer
application
auth
authorize_interactions
directories
errors	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
filters
follower_accounts
following_accounts
home	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
invites
kaminari
layouts
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer
oauth
public_timelines
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01:00
remote_follow
remote_interaction
remote_unfollows
settings
shared	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
shares
stream_entries
tags	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
user_mailer	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00