Mastodon

Files

T

Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.

2018-10-30 17:52:08 +01:00

about

…

accounts

Add description meta tag additionally to og:description (#8941 )

2018-10-10 02:21:30 +02:00

admin

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

admin_mailer

…

application

…

auth

Fix td instead of th in sessions table header (#9162 )

2018-10-30 17:00:34 +01:00

authorize_interactions

…

errors

…

filters

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-26 20:41:43 +02:00

media

…

notification_mailer

…

oauth

…

remote_follow

…

remote_interaction

…

remote_unfollows

…

settings

move some constants to rails environment

2018-10-29 21:29:31 +01:00

shared

Add description meta tag additionally to og:description (#8941 )

2018-10-10 02:21:30 +02:00

…

stream_entries

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-26 20:41:43 +02:00