diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-06 11:36:55 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-06 11:36:55 +0000 |
| commit | a434d89ef0479fb3776833621a79db253de6b674 (patch) | |
| tree | 5008dcd53b2be2f01cd70270e824136a35ca45eb /spec/controllers/user_controller_spec.rb | |
| parent | 12a5f07f6826166f7cc25214db54a6b75eb1e711 (diff) | |
| parent | b476615a00ea8ad699c412c604cbae18388dedd7 (diff) | |
Merge branch 'release/0.5' into wdtk
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions