70e37925c6
Conflicts: app/assets/stylesheets/design/custom.scss db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
70e37925c6
Conflicts: app/assets/stylesheets/design/custom.scss db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |