User/Person models merge

This commit is contained in:
Stella Rouzi 2014-06-23 19:07:50 +03:00
parent 66b84e3660
commit 23bf55b66c
80 changed files with 1064 additions and 1221 deletions

View file

@ -2,7 +2,7 @@
FactoryGirl.define do
factory :registration do
person
user
conference
end
end