diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-07-22 16:46:44 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-07-22 16:46:44 +0200 |
| commit | c461c769001d1507c5d9e3192322b9f73f13e2e8 (patch) | |
| tree | 7970318880805ab0854d2bd9381a84a4c5a2833d | |
| parent | c3f2302be71d4b3bc2dd4cc67dd16c4505203498 (diff) | |
| parent | bf6dc46c644002dd195dfad18af9a1116a00fad4 (diff) | |
Merge branch 'FreshRSS/dev' into db_username_length
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | CREDITS.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f6e74281..be38141d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * I18n * Korean [#1578](https://github.com/FreshRSS/FreshRSS/pull/1578) * Bug fixing - * PHP 7.1 compatibility for the API [#1584](https://github.com/FreshRSS/FreshRSS/issues/1584) + * PHP 7.1 compatibility for the API [#1584](https://github.com/FreshRSS/FreshRSS/issues/1584), [#1594](https://github.com/FreshRSS/FreshRSS/pull/1594) ## 2017-06-03 FreshRSS 1.7.0 diff --git a/CREDITS.md b/CREDITS.md index 97651ab20..70c7437a9 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -10,6 +10,7 @@ People are sorted by name so please keep this order. * [Alexis Degrugillier](https://github.com/aledeg): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=aledeg) * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin) * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/) +* [Anton Smirnov](https://github.com/sandfoxme): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:sandfoxme), [Web](http://sandfox.me/) * [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK) * [Crupuk](https://github.com/Crupuk): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Crupuk) * [Damstre](https://github.com/Damstre): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Damstre) |