From 8d1d11db0ca94a9012b3f3e2d66cc7149d744e70 Mon Sep 17 00:00:00 2001
From: Michael Altfield <michael@michaelaltfield.net>
Date: Sun, 1 Jan 2023 20:43:09 -0600
Subject: [PATCH] updated attribution to include Francois Marier, who submitted
 several issues for bugs, enhancements, PRs, and helped bring the BusKill app
 into the Debian repos in 2022/2023

 * https://github.com/fmarier
 * https://github.com/BusKill/buskill-app/issues/31#issuecomment-1368572031
---
 CHANGELOG            | 20 ++++++++++++--------
 docs/attribution.rst |  3 ++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 723e7b24..ceb8c2b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 buskill-app changelog
 
+[0.7.0] - 2023-??-??
+TODO
+* special thanks to Francois Marier <https://fmarier.org/> for numerous contributions
+
 [0.6.0] - 2022-10-24
 + added soft-shutdown trigger to cli
 * fixed in-app update bug in MacOS
@@ -15,18 +19,18 @@ buskill-app changelog
 * patched various in-app update bugs
 
 [0.3.0] - 2020-10-05
-+ Added buskill icon
++ added buskill icon
 
 [0.2.1] - 2020-10-06
 * patched various in-app update bugs
 
 [0.2.0] - 2020-09-26
-+ Added in-app update functionality
-+ Special thanks to Melanie Allen <https://github.com/goldfishlaser> for their pull requests
++ added in-app update functionality
+* special thanks to Melanie Allen <https://github.com/goldfishlaser> for their pull requests
 
 [0.1.0] - 2020-07-31
-+ Initial version with self-contained releases for Linux, Windows, and MacOS
-+ Functionality is limited to arming and disarming from the CLI or GUI
-+ The only trigger supported is lockscreen
-+ The trigger is executed when *any* USB device is removed
-+ Thank you to Michael Altfield, cyberkryption, Steven Johnson, and Jacob Neplokh
++ initial version with self-contained releases for Linux, Windows, and MacOS
++ functionality is limited to arming and disarming from the CLI or GUI
++ the only trigger supported is lockscreen
++ the trigger is executed when *any* USB device is removed
++ thank you to Michael Altfield, cyberkryption, Steven Johnson, and Jacob Neplokh
diff --git a/docs/attribution.rst b/docs/attribution.rst
index 2c307eae..7f26b4fb 100644
--- a/docs/attribution.rst
+++ b/docs/attribution.rst
@@ -8,7 +8,8 @@ Thank you to the following folks who have contributed to the BusKill project!
  * `cyberkryption <https://twitter.com/cyberkryption>`_
  * `Steven Johnson <https://www.linkedin.com/in/sj2019/>`_
  * `Jacob Neplokh <https://jacobneplokh.com/>`_
- * `Melanie Allen <http://melanieallen.pro/>`_
+ * `Melanie Allen <https://github.com/goldfishlaser>`_
+ * `François Marier <https://fmarier.org/>`_
 
 This project would not have been possible without the following tools and services:
  * `Python <https://www.python.org/>`_