Merge branch 'extended-cookie'

[scuttle] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7e9e3afee9b0dbc0fbc847dc4723ee9e27048314..d4332f336c82e8c8a97c56c78ed252c924b0f7b5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 config.inc.php
+cache/
+*~