merge master

This commit is contained in:
Michael Ball 2020-12-04 01:17:39 -08:00
commit 2892a56a1c
12 changed files with 70 additions and 70 deletions

View file

@ -165,7 +165,7 @@ describe Conference do
end
describe '#get_submissions_data' do
it 'returns emtpy hash if there is no cfp or events' do
it 'returns empty hash if there is no cfp or events' do
expect(subject.get_submissions_data).to eq []
end