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
..
_features.html.haml	Grid layout for tag pages (#6545)	2018-02-26 17:43:45 +01:00
_og.html.haml	Strip tags from og:description on public tag page (#7437)	2018-05-10 14:38:40 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00