From a2388bb242f0774310ec4f8d3350e86efe51770a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 6 Dec 2018 15:20:25 +0100
Subject: [PATCH] chg: Bump Changelog, again

---
 CHANGELOG.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 12671d7..d8c1dc2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -21,6 +21,7 @@ New
 
 Changes
 ~~~~~~~
+- Bump Changelog. [Raphaël Vinot]
 - Bump version. [Raphaël Vinot]
 - Bump misp-objects & describeTypes. [Raphaël Vinot]
 - Bump Changelog. [Raphaël Vinot]
@@ -61,6 +62,15 @@ Fix
 Other
 ~~~~~
 - Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
+- Merge pull request #310 from DragonDev1906/master. [Raphaël Vinot]
+
+  Added get_object & get_attribute (by ID)
+- Dded get_object & get_attribute. [DragonDev1906]
+- Merge pull request #307 from garanews/patch-1. [Raphaël Vinot]
+
+  fix for last pymisp version
+- Fix for last pymisp version. [garanews]
+- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Merge pull request #305 from dawid-
   czarnecki/feature/include_proposals. [Raphaël Vinot]