24124766f4
Conflicts: Gemfile.lock config/locales/en.yml db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
24124766f4
Conflicts: Gemfile.lock config/locales/en.yml db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |