Merge branch 'master' of git://gitorious.org/laconica/mainline

[quix0rs-gnu-social.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f5a3e0212f8d7b11cf2a542d176a99da57b04819..f2e96d3eb662e89c5938a74382846233c3544726 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ dataobject.ini
 *.bak
 *.orig
 *.rej
+.#*