diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-31 14:45:37 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-31 14:45:37 +0100 |
| commit | a97bbd9bd54c5fa56d54b3c214cf4e8af96af8b2 (patch) | |
| tree | 6e83890bc1b3814a12c3b7bedc0d5944f30f507b /CREDITS | |
| parent | 42fd539a1b14f883077048a35864b4294b6efe94 (diff) | |
| parent | e91b72b63cd11ae3c4f59e48439e93955242c673 (diff) | |
Merge branch 'dev'
Conflicts:
CHANGELOG
README.fr.md
README.md
app/Controllers/feedController.php
app/Controllers/indexController.php
app/i18n/en.php
app/i18n/fr.php
app/views/helpers/view/normal_view.phtml
app/views/stats/index.phtml
app/views/stats/repartition.phtml
constants.php
p/scripts/main.js
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS new file mode 100644 index 000000000..47a968deb --- /dev/null +++ b/CREDITS @@ -0,0 +1,39 @@ +This is a credit file of people who have contributed to FreshRSS with, at least, +one commit on the FreshRSS repository (at https://github.com/FreshRSS/FreshRSS). +Please note a commit on THIS specific file is not considered as a contribution +(too easy!). It's purpose is to show even the smallest contribution is important. +People are sorted by name so please keep this order. + +--- + +Alexandre Alapetite +https://github.com/Alkarex + +Alexis Degrugillier +https://github.com/aledeg + +Alwaysin +https://github.com/Alwaysin + +Amaury Carrade +https://github.com/AmauryCarrade + +ealdraed +https://github.com/ealdraed + +Luc Didry +https://github.com/ldidry + +Marien Fressinaud +dev@marienfressinaud.fr +http://marienfressinaud.fr +https://github.com/marienfressinaud + +Nicolas Elie +https://github.com/nicolaselie + +plopoyop +https://github.com/plopoyop + +tomgue +https://github.com/tomgue |