aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-09-13 16:29:59 +0100
committerLouise Crow <louise.crow@gmail.com>2012-09-13 16:29:59 +0100
commit4f436ae56238faa4ab49b6d299152f04b266fd7a (patch)
treea6a73b67dd3d2129e539350c1a763633eb961aaa /spec/controllers/user_controller_spec.rb
parenta622b31a33658696525ad675cdeb1e433f2a7c8b (diff)
parent0ec315c52a731ff149977b9231a15770fa3bd742 (diff)
Merge branch 'feature/faster-admin-timeline' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions