Commit b78f68b6 authored by Fardale's avatar Fardale

Merge branch 'test_connexion' of...

Merge branch 'test_connexion' of gitlab.crans.org:genie_logiciel_2015/the_dungeon_project into test_connexion
parents 79b375d0 9cdffeff
......@@ -14,3 +14,5 @@ Ramusat Yann
Ringeade Clément
Toussaint Etienne
Hilaire Mathieu
Ceci est une démo
\ No newline at end of file
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