diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
| commit | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (patch) | |
| tree | 15333943091fc3ae79dedee46a6dd34ce3f1a1ec /spec/controllers/public_body_controller_spec.rb | |
| parent | 646fffde374e575ab53cfae78e7a0c521cd90d6f (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'spec/controllers/public_body_controller_spec.rb')
| -rw-r--r-- | spec/controllers/public_body_controller_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 9eca43aee..d12818a1c 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe PublicBodyController, "when showing a body" do |