7d3dd5eaf1
Conflicts: spec/models/cancan_spec.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
7d3dd5eaf1
Conflicts: spec/models/cancan_spec.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |