diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-11-04 20:17:29 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-11-04 20:17:29 +0100 |
| commit | a1267baa0b1caa801547ee674d9bb03c4b15d00b (patch) | |
| tree | 78c5567578751752a3623574cbd768e602a46754 /CREDITS.md | |
| parent | 133e369afff02e5984fe4ce5109e33fd2fbccfc7 (diff) | |
| parent | 4525e547faa8781e37f86125110f28248eb67fd3 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'CREDITS.md')
| -rw-r--r-- | CREDITS.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CREDITS.md b/CREDITS.md index 148eac021..b21e8be85 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -12,6 +12,8 @@ People are sorted by name so please keep this order. * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade) * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed) * [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry) +* [Marcus Rohrmoser](https://github.com/mro): +[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mro) * [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/) * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek) * [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie) |