merge changes from main

rkingsbury · rkingsbury · commit 1d5467666c5c · 2023-08-12T20:16:29.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,12 @@
 - Add pre-commit configuration and lint with `black`
 - Update packaging to use [pyscaffold](https://pyscaffold.org/en/stable/index.html)
 
+## 0.5.2 (2020-04-21)
+
+ - Fix breaking bug introduced by upstream pint change to avogadro_number
+ - Format project with black
+ - Misc. linting and docstring changes
+
 ## 0.5.0 (2018-09-19)
 
 - Implement the effective Pitzer model for improved activity calculations in multicomponent solutions
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022 Ryan S. Kingsbury
+Copyright (c) 2013-2023 Ryan S. Kingsbury
 
 pyEQL is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License as published by the

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2013-2022 Ryan S. Kingsbury`
	`1`	`+Copyright (c) 2013-2023 Ryan S. Kingsbury`
`2`	`2`
`3`	`3`	`pyEQL is free software; you can redistribute it and/or modify it under`
`4`	`4`	`the terms of the GNU Lesser General Public License as published by the`