From 2a772466ae1e0ab1d3229bcc3370353ede8716e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Sun, 1 Jul 2018 23:24:06 +0800
Subject: [PATCH] chg: Bump changelog, again

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aa4ff31..2ea8ac8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,7 @@ New
 
 Changes
 ~~~~~~~
+- Bump changelog & version. [Raphaël Vinot]
 - Moar jupyter. [Raphaël Vinot]
 - Bump misp-objects. [Raphaël Vinot]
 - Add full example. [Raphaël Vinot]
@@ -28,6 +29,12 @@ Changes
 Other
 ~~~~~
 - Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
+- Merge pull request #247 from neok0/master. [Raphaël Vinot]
+
+  enabled published search parameter for attributes controler
+- Enabled published search parameter for attributes controler. [Tobias
+  Mainka]
+- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Merge pull request #241 from cipherlock/master. [Raphaël Vinot]
 
   new:Add the ability to add Other attributes via the API