Merge remote branch 'upstream/master'

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index a2d1ffa..3dfb8a9
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@ include/jquery-1.4.2.min.js
 *.version*
 favicon.*
 home.html
+addon
 *~
+