diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
commit | 184ffeccb7f4579b481db9b7744aa9baed70562f (patch) | |
tree | 67c023b029a699a1e727ef6becdc0832e82ea1c5 /app/models/public_body.rb | |
parent | e44c8b875fd4ad46b954ef9c31bdb6f0366dcb9e (diff) | |
parent | 79b2f672aeae394a2c195d89b70bda27bb3201a4 (diff) |
Merge branch 'feature/batch-requests' into rails-3-develop
Conflicts:
config/general.yml-example
spec/factories.rb
Diffstat (limited to 'app/models/public_body.rb')
-rw-r--r-- | app/models/public_body.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index a78a6677e..7b1ded820 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # == Schema Information +# Schema version: 20131024114346 # # Table name: public_bodies # |