about summary refs log tree commit diff
path: root/spec/routing
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-11 18:12:42 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-11 18:12:42 +0200
commit45fce0e496727cd1579c630c22592638341f78c6 (patch)
treeff72ae5b3482e4df7885e1e5a38c982529fd11c4 /spec/routing
parent34142ab29c33104793afe3199f102d84b83b9b57 (diff)
parent352bae8c3ef2aca41de4aacb85d5e036a1d2bace (diff)
Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
Diffstat (limited to 'spec/routing')
0 files changed, 0 insertions, 0 deletions