summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-07-22 14:26:28 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-07-22 14:26:28 -0700
commitd343b78cc803636ecaa152a0517f4beccf2220db (patch)
treea1c94063d5788f0529e9577eabebdb7a79e45fc2
parent5cae6944dd53b6b0955685aef1810c27b920ebf6 (diff)
downloadffi-yajl-d343b78cc803636ecaa152a0517f4beccf2220db.tar.gz
update changelog
-rw-r--r--CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bce9e01..cf29ee1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Change Log
+## [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)
+
+**Merged pull requests:**
+
+- replace Fixnum+Bignum with Integer [\#80](https://github.com/chef/ffi-yajl/pull/80) ([lamont-granquist](https://github.com/lamont-granquist))
+- update travis matrix [\#78](https://github.com/chef/ffi-yajl/pull/78) ([lamont-granquist](https://github.com/lamont-granquist))
+
## [2.2.3](https://github.com/chef/ffi-yajl/tree/2.2.3) (2016-01-07)
[Full Changelog](https://github.com/chef/ffi-yajl/compare/2.2.2...2.2.3)