diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
| commit | 7f0ae82d44873b53cc87c659b42415ce4866c7b4 (patch) | |
| tree | fdce14b0658bb05aef087dd4e09dc25c9a79ea8c /spec/controllers/user_controller_spec.rb | |
| parent | 2926ee877bcf8974c529e1271ded42971fe0d632 (diff) | |
| parent | 96c4dd912083edcd0c9eda76bd2301bb4a1a6d53 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop, fix conflicts
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions