Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge		2018-05-14 20:51:50 +02:00
..
about	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
accounts	Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape	2018-05-12 17:53:01 +02:00
admin	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	2018-05-04 13:26:25 +02:00
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	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
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
shares
stream_entries	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
tags	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
user_mailer
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	2018-05-02 22:28:46 +02:00