2eab1fd2c9
# Conflicts: # Gemfile # Gemfile.lock |
||
---|---|---|
.. | ||
fixtures | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |
2eab1fd2c9
# Conflicts: # Gemfile # Gemfile.lock |
||
---|---|---|
.. | ||
fixtures | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |