Mastodon

Files

Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge

Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml

2018-05-11 18:12:42 +02:00

about

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

accounts

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

admin

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

admin_mailer

…

application

…

auth

Add contact e-mail hint to 2FA login form (#7376 )

2018-05-06 10:52:36 +02:00

authorize_follows

Enable custom emojis in profiles (notes, field values, display names) (#7374 )

2018-05-06 11:48:51 +02:00

errors

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

…

media

…

notification_mailer

…

oauth

…

remote_follow

…

remote_unfollows

Enable custom emojis in profiles (notes, field values, display names) (#7374 )

2018-05-06 11:48:51 +02:00

settings

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

shared

Enable custom emojis in profiles (notes, field values, display names) (#7374 )

2018-05-06 11:48:51 +02:00

…

stream_entries

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00