Merge branch 'pull'

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cbdf03673bbdf269bb4063bf2c3507859da7d2c3..3dfb8a903a4e7a9587c7d3c25538ff43a7aee996 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ include/jquery-1.4.2.min.js
 favicon.*
 home.html
 addon
+*~
+