aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/public_body_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-04-07 11:58:17 +0100
committerLouise Crow <louise.crow@gmail.com>2015-04-07 11:58:17 +0100
commitcd0823a4bae3e98301e2eeea50c6d0f5c9c8e83d (patch)
treef0b00375029befed51141073ed7ddb132b6ba587 /app/controllers/public_body_controller.rb
parentffb17f312c312fdba49ab961520d423bdde22503 (diff)
parent6957323c90fe4b69b06e570862412f018a6e48ae (diff)
Merge branch 'hotfix/0.21.0.7'0.21.0.7
Conflicts: config/initializers/alaveteli.rb
Diffstat (limited to 'app/controllers/public_body_controller.rb')
0 files changed, 0 insertions, 0 deletions