git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[unfold.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
bb1d472
..
21f5aa6
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-16,6
+16,10
@@
plugins/*/*.css
plugins/*/*.js
plugins/*/*.html
# myslice.ini* is not intended to be under git as it may contain keys and other specifics
plugins/*/*.js
plugins/*/*.html
# myslice.ini* is not intended to be under git as it may contain keys and other specifics
-myslice.ini
*
-#
other junk
+myslice.ini
+#other junk
foo.*
foo.*
+.project
+.settings
+.pydevproject
+/sla/trashcan