rgarcia c55021e18b fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

..

features

fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

models

fixing conflicts [#6]

2015-07-16 21:29:44 +02:00

factories.rb

fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

rails_helper.rb

fixing conflicts [#8]

2015-07-18 15:04:36 +02:00

spec_helper.rb

configures factory_girl [#5]

2015-07-16 19:24:54 +02:00