summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-06-21 12:33:21 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2017-06-21 12:33:21 -0700
commit1b79e9a9a71969a261bb41cf9b8a93948b5f5877 (patch)
tree2237577e6fb7a51589157f6fb1cbfcb1a38a7ff9 /CHANGELOG.md
parent5605afa19d54c9ff5450a0186a29c95c666f6503 (diff)
downloadffi-yajl-1b79e9a9a71969a261bb41cf9b8a93948b5f5877.tar.gz
bump version2.3.1
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf29ee1..f886169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Change Log
+## [Unreleased](https://github.com/chef/ffi-yajl/tree/HEAD)
+
+[Full Changelog](https://github.com/chef/ffi-yajl/compare/2.3.0...HEAD)
+
+**Merged pull requests:**
+
+- Require Ruby 2.2 and fix testing [\#87](https://github.com/chef/ffi-yajl/pull/87) ([tas50](https://github.com/tas50))
+- Fix license. [\#86](https://github.com/chef/ffi-yajl/pull/86) ([voxik](https://github.com/voxik))
+
## [2.3.0](https://github.com/chef/ffi-yajl/tree/2.3.0) (2016-07-22)
[Full Changelog](https://github.com/chef/ffi-yajl/compare/2.2.3...2.3.0)