769acb6593
Conflicts: app/models/user.rb spec/models/user_spec.rb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
middleware | ||
models | ||
serializers | ||
services | ||
uploaders | ||
views | ||
workers |
769acb6593
Conflicts: app/models/user.rb spec/models/user_spec.rb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
middleware | ||
models | ||
serializers | ||
services | ||
uploaders | ||
views | ||
workers |