projects
/
friendica-addons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '3.6-rc'
[friendica-addons.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 39340a425ee8cde5a3516ab2a519d7bcb01ab9bf..36ccc906e56c08e141dbabf5df1e7b31b120524c 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-15,7
+15,7
@@
report/
.buildpath
\r
.externalToolBuilders
\r
.settings
\r
-#ignore OSX .DS_Store files
\r
+#ignore OSX .DS_Store files
\r
.DS_Store
\r
\r
/nbproject/private/
\r