Commit fae66cd2 authored by Amine  GHOZLANE's avatar Amine GHOZLANE
Browse files

Merge branch 'master' of https://github.com/aghozlane/shaman

parents 255e6cd2 a5fb1c78
...@@ -54,11 +54,11 @@ If you have any comments, questions or suggestions, or need help to use SHAMAN, ...@@ -54,11 +54,11 @@ If you have any comments, questions or suggestions, or need help to use SHAMAN,
## Acknowledgements ## Acknowledgements
The main contributors to SHAMAN: The main contributors to SHAMAN:
Pierre Lechat (Coding, testing, feature suggestions) Pierre Lechat (Coding, testing, feature suggestions)
Hugo Varet (Coding, testing, feature suggestions) Hugo Varet (Coding, testing, feature suggestions)
Christophe Malabat (Packaging) Christophe Malabat (Packaging)
Marie-Agnès Dillies (Evaluation) Marie-Agnès Dillies (Evaluation)
Sean Kennedy (Evaluation) Sean Kennedy (Evaluation)
Thanks to the following people for patches and other suggestions for improvements: Thanks to the following people for patches and other suggestions for improvements:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment