diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-12 10:23:36 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-12 10:23:36 +0100 |
| commit | bb5f18ff9253b82d4402db29e24eb1359818baae (patch) | |
| tree | ef65812d18838cb8fde964c5dc17a643355fd02c /app/models/public_body.rb | |
| parent | 8d04d8a492a7d0a78802bd89998006352b910581 (diff) | |
| parent | f9507e0347b9b423791530bc57be00ac873646d5 (diff) | |
Merge remote-tracking branch 'openaustralia_github/postfix_log_support' into develop
Conflicts:
Gemfile.lock
app/models/exim_log.rb
Diffstat (limited to 'app/models/public_body.rb')
| -rw-r--r-- | app/models/public_body.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 34bcd332c..c70aff9b9 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -17,7 +17,7 @@ # notes :text default(""), not null # first_letter :string(255) not null # publication_scheme :text default(""), not null -# api_key :string(255) +# api_key :string(255) not null # info_requests_count :integer default(0), not null # |