From: emilie <emilie@devijver.org>
Date: Thu, 23 Mar 2017 13:51:41 +0000 (+0100)
Subject: Après mon merge héroïque
X-Git-Url: https://git.auder.net/game/current/%7B%7B%20asset%28%27mixstore/js/doc/%7B%7B%20pkg.url%20%7D%7D?a=commitdiff_plain;h=944d9d1c74f8d7f2cd0033cc3f7a2a032e356bbb;p=valse.git

Après mon merge héroïque
---

944d9d1c74f8d7f2cd0033cc3f7a2a032e356bbb
diff --cc .gitignore
index d52ee00,d52ee00..b0455d8
--- a/.gitignore
+++ b/.gitignore
@@@ -26,3 -26,3 +26,4 @@@
  #misc
  Rprof.out
  *.zip
++.Rproj.user