Skip to content

Commit

Permalink
Merge pull request #248 from swcraig/changelog-update
Browse files Browse the repository at this point in the history
Update CHANGELOG
  • Loading branch information
swcraig committed Dec 6, 2017
2 parents 30e630c + 8bd6939 commit 1d0aaa2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
For non-trivial PRs, please add an entry to the CHANGELOG (following the convention in place).

If the changes are geography related (overlay/locale modifications) place the entry under "Geographic Modifications".

Please follow this format _exactly_:

`[#<pr-number>] <PR description _without_ an ending period> ([@<github-handle>](<github-profile>))`

------------------------------------------

**Please remove the text in this template before submitting your Pull Request**
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
### master (unreleased)

##### Geographic Modifications
* [#247](https://github.com/carmen-ruby/carmen/pull/247) Fix New Zealand regions
to match 2015-11-27 ISO correction ([@louim](https://github.com/louim))

### 1.1.0 (November 7, 2017)
* [#231](https://github.com/carmen-ruby/carmen/pull/231) Base ISO data has been updated for the first time since October 25, 2014
* [#233](https://github.com/carmen-ruby/carmen/pull/233) Revert removing Puerto Rico as a country code
Expand Down

0 comments on commit 1d0aaa2

Please sign in to comment.