diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-05-29 11:41:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-05-29 11:41:31 +0100 |
| commit | a4f4968f540864ad1ffaca1a87d645aa5e63e7dc (patch) | |
| tree | 98512d0222e00428e6ee91d1e3a869193ab09777 /app/controllers/user_controller.rb | |
| parent | f06da9241f28b96cebcadddda09ef525eeb071a0 (diff) | |
| parent | 65e9bd66ead001125a792ff3bf483cc341e66048 (diff) | |
Merge branch 'loop-in-cached-attachment-recreation' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
0 files changed, 0 insertions, 0 deletions