aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-06-13 18:09:06 +0100
committerLouise Crow <louise.crow@gmail.com>2014-06-13 18:09:06 +0100
commit2505982bed3483af6f1ea42d185acfb1dbac571b (patch)
treeb5380901525891814735804a5d9550fe04d17078 /spec/controllers/user_controller_spec.rb
parent552b08318cff55e12defccd4d617f4eb59e13204 (diff)
parenteab0b3d1b7cbb86ae9d31964d73adc8d3d0c18c5 (diff)
Merge branch 'issues/1561-remove-duplicate-documentation' into rails-3-develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions