You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge	7 years ago
fabricators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
features	…
fixtures	…
helpers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
lib	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge	7 years ago
policies	…
presenters	…
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/master	7 years ago
support	…
validators	…
views	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
workers	…
rails_helper.rb	…
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago