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
..
_follow_button.html.haml	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	2018-04-08 13:40:22 +02:00
_follow_grid.html.haml	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	2018-04-08 13:40:22 +02:00
_grid_card.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
_header.html.haml	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
_moved_strip.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
_nothing_here.html.haml	Localizations for most server-side strings	2016-11-16 00:55:33 +01:00
_og.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00
show.html.haml	Add alternate for RSS (#7436)	2018-05-10 14:38:19 +02:00