aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-02-06 14:50:48 +0100
committerGravatar GitHub <noreply@github.com> 2017-02-06 14:50:48 +0100
commit201009dce8a0afff9daf2d22156b2f76e9d59901 (patch)
treec03626dd1667ea41e9fc62a7c5e112b2ab8d6c70
parentac42e7eae0f08491b40d17e8fd5687e902c005c8 (diff)
parent2b6984e4c97d103014ac3721c78247ef927bb674 (diff)
Merge pull request #1418 from Alkarex/Changelog-1417
Changelog 1417
-rw-r--r--CHANGELOG.md2
-rw-r--r--CREDITS.md1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 471124aae..81811db16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
* UI
* Chrome parity with Firefox: auto-focus tab when clicking on notification [#1409](https://github.com/FreshRSS/FreshRSS/pull/1409)
+* Bug fixing
+ * Fix PostgreSQL bugs with API and feed modifications [#1417](https://github.com/FreshRSS/FreshRSS/pull/1417)
## 2016-12-26 FreshRSS 1.6.2
diff --git a/CREDITS.md b/CREDITS.md
index 8a23814dc..7ab8bc02b 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -34,5 +34,6 @@ People are sorted by name so please keep this order.
* [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi)
* [subic](https://github.com/subic): [contributions](https://github.com/FreshRSS/documentation/commits?author=subic)
* [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
+* [Thomas Citharel](https://github.com/tcitworld): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:tomgue), [Web](https://www.tcit.fr/)
* [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
* [Wanabo](https://github.com/Wanabo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Wanabo)