From d5a11d0685d376c007c823356633f31f88092c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?=
 <stephane.bidoul@acsone.eu>
Date: Wed, 17 May 2017 15:56:04 +0200
Subject: [PATCH] update changelog

---
 README.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.rst b/README.rst
index b733ed8..59d7083 100644
--- a/README.rst
+++ b/README.rst
@@ -172,6 +172,14 @@ Only aggregate a specific repository using `fnmatch`_:
 Changes
 =======
 
+1.2.0 (May, 17, 2017)
+---------------------
+
+* support .yml config file extension
+* add a show-closed-prs command to display github pull requests
+  that are not open anymore; github pull requests must be referenced
+  as refs/pull/NNN/head in the merges section
+
 1.1.0 (Feb, 01, 2017)
 ---------------------
 
@@ -200,10 +208,12 @@ Contributors
 * Cyril Gaudin (camptocamp_)
 * Jairo Llopis (Tecnativa_)
 * Stéphane Bidoul (ACSONE_)
+* Dave Lasley (LasLabs_)
 
 .. _ACSONE: https://www.acsone.eu
 .. _Tecnativa: https://www.tecnativa.com
 .. _camptocamp: https://www.camptocamp.com
+.. _LasLabs: https://laslabs.com
 
 Maintainer
 ----------