Commit 3cadd33f authored by Patrick's avatar Patrick

Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
parents 7a763ee5 d3e2c990
......@@ -21,4 +21,4 @@ http://biodici.be/fr/
http://epidici.be/fr/
Licence : GPL v3
\ No newline at end of file
Licence : GPL v3
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