From 6f0742f341f9dbeffec15555315e0915b05e63bd Mon Sep 17 00:00:00 2001
From: grizzly <grisel-davy@crans.org>
Date: Wed, 21 Aug 2019 13:18:51 +0200
Subject: [PATCH 1/2] Update CHANGELOG.md - tickets

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40ca06d6..021728f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## MR 427: Tickets
+Manually edit `settings_local.py` to provide the new `OPTIONNAL_APPS` lists:
+```python
+OPTIONNAL_APPS_RE2O = ('tickets',)
+OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + (...,...,)
+```
+
 ## MR 160: Datepicker
 
 Install libjs-jquery libjs-jquery-ui libjs-jquery-timepicker libjs-bootstrap javascript-common

From 73916de0da9f18871e9442201305050d9fba1150 Mon Sep 17 00:00:00 2001
From: klafyvel <klafyvel@gmail.com>
Date: Thu, 5 Sep 2019 23:20:09 +0200
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 021728f9..b3fb3951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,3 @@
-## MR 427: Tickets
-Manually edit `settings_local.py` to provide the new `OPTIONNAL_APPS` lists:
-```python
-OPTIONNAL_APPS_RE2O = ('tickets',)
-OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + (...,...,)
-```
-
 ## MR 160: Datepicker
 
 Install libjs-jquery libjs-jquery-ui libjs-jquery-timepicker libjs-bootstrap javascript-common
@@ -185,3 +178,12 @@ Be carefull, you need the proper rights to edit a DocumentTemplate.
 Re2o now sends subscription voucher when an invoice is controlled. It uses one
 of the templates. You also need to set the name of the president of your association
 to be set in your settings.
+
+## MR 427: Tickets
+Manually edit `settings_local.py` to provide the new `OPTIONNAL_APPS` lists:
+```python
+OPTIONNAL_APPS_RE2O = ('tickets',)
+OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + (...,...,)
+```
+
+Don't forget to run migrations afterwards.