e0b7699ffd
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64. Conflicts: app/models/user.rb |
||
---|---|---|
.. | ||
controllers | ||
factories | ||
helpers/settings | ||
mailers | ||
models | ||
routing | ||
support | ||
tests.git | ||
spec_helper.rb |