Merge remote-tracking branch 'origin/master'

[jirafeau_project.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index bfa50cd4f56a8575be29aa15899163f2768acbf0..00bbc72b285adad155da5ee3c93801fd57b08521 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 lib/config.local.php
 lib/config.local.php

+lib/tos.local.txt

 var-*
 var-*