diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-31 09:53:39 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-31 09:53:39 +0100 |
commit | 703f6371ec41cc614137e07666f345b4bbc44a5e (patch) | |
tree | 52ae9fd43d43d5a68f60b350349cd7076cbc62e0 /spec/controllers/user_controller_spec.rb | |
parent | 9c7f41ac8e02a095063244a2f97660e359d4e353 (diff) | |
parent | c7c9425208f082caecb1436d7e9ff54dd6344600 (diff) |
Merge branch 'new-base-design-seb' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions