diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-26 12:19:41 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-26 12:19:41 +0200 |
| commit | e12f9d4a98f3e95cea6e9506c2517984e6100b1f (patch) | |
| tree | 52f36d728f922f54bb99addde2c2acd3a077e87d /CREDITS.md | |
| parent | d4d2c62b529b774aa3dcfc98bb9ff135e5f185c3 (diff) | |
| parent | b848511574d52ca34c91dfacc7ff0e0059b083a6 (diff) | |
Merge remote-tracking branch 'FreshRSS/dev' into dev
Diffstat (limited to 'CREDITS.md')
| -rw-r--r-- | CREDITS.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS.md b/CREDITS.md index cd6e7cb06..d30af7542 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -21,6 +21,7 @@ People are sorted by name so please keep this order. * [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/) * [Guillaume Hayot](https://github.com/postblue): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:postblue), [Web](https://postblue.info/) * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb) +* [hoilc](https://github.com/hoilc): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:hoilc) * [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/) * [jlefler](https://github.com/jlefler): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jlefler) * [Jonas Östanbäck](https://github.com/cez81): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=cez81) |