diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-01 14:59:14 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-01 14:59:14 +0000 |
| commit | 46b168afd41b44498fc601ec452f9b7bbd8f8361 (patch) | |
| tree | c15bed619f76229c632e037c1e6ab5475a4d93c5 /spec/controllers/admin_general_controller_spec.rb | |
| parent | 8d1987e956993c2f862eacc6676d78f709a88e2f (diff) | |
| parent | 20346a03fee865f9213c65e80bac7b7a8dfb1837 (diff) | |
Merge branch 'rails-3-develop' into release/0.20
Diffstat (limited to 'spec/controllers/admin_general_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions