diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
| commit | 6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (patch) | |
| tree | 7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /spec/controllers/user_controller_spec.rb | |
| parent | 6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (diff) | |
| parent | e13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff) | |
Merge branch 'release/0.4' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions