24124766f4
Conflicts: Gemfile.lock config/locales/en.yml db/schema.rb |
||
---|---|---|
.. | ||
controllers | ||
factories | ||
helpers | ||
mailers | ||
models | ||
routing | ||
support | ||
tests.git | ||
spec_helper.rb |
24124766f4
Conflicts: Gemfile.lock config/locales/en.yml db/schema.rb |
||
---|---|---|
.. | ||
controllers | ||
factories | ||
helpers | ||
mailers | ||
models | ||
routing | ||
support | ||
tests.git | ||
spec_helper.rb |