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	…
_og.html.haml	…
show.html.haml	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00