Merge branch 'master' into test-fix

2017-11-14 12:37:33 -08:00 · 2017-11-14 12:37:33 -08:00 · 7f369507d2
commit 7f369507d2
parent 906c05ec4e 84dedb42c3
16 changed files with 62 additions and 17 deletions
--- a/spec/factories/cfps.rb
+++ b/spec/factories/cfps.rb
@ -5,7 +5,7 @@ FactoryGirl.define do
    start_date { 1.day.ago }
    end_date { 2.days.from_now }
    cfp_type 'events'
-
+    description 'This is a test description'
    program
  end
 end