Juanjo Bazán 984984473f Fix conflict

2015-07-18 21:58:43 +02:00

..

features

Fix conflict

2015-07-18 21:58:43 +02:00

models

removes sample pending spec

2015-07-18 20:38:01 +02:00

factories.rb

fixes syntax error [#9]

2015-07-18 18:19:45 +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