aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-11-24 12:47:38 +0000
committerSeb Bacon <seb.bacon@gmail.com>2011-11-24 12:47:38 +0000
commit45b042193acc27fb0fd8911e7ea216f5734077f1 (patch)
treef15093086b2ff767968e6bbd1b816c66f35bd5dd /spec/controllers/user_controller_spec.rb
parent589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff)
parent76168e23fd78d276a197cc992bb6ef5a065f6f3f (diff)
Merge branch 'xapian-dcabo' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions