Merge branch 'master' of https://github.com/friendica/friendica-addons

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..e185064
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,24 @@
+favicon.*\r
+.htconfig.php\r
+\#*\r
+*.log\r
+*.out\r
+*.version*\r
+favicon.*\r
+*~\r
+\r
+#ignore reports, should be generted with every build\r
+report/\r
+\r
+#ignore config files from eclipse, we don't want IDE files in our repository\r
+.project\r
+.buildpath\r
+.externalToolBuilders\r
+.settings\r
+#ignore OSX .DS_Store files \r
+.DS_Store\r
+\r
+/nbproject/private/\r
+\r
+#ignore smarty cache\r
+/view/smarty3/compiled/
\ No newline at end of file