Code Review
/
dlux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Fix for bug 2535."
[dlux.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 13e67cbb89a7656ba18128421f98a5072b397ea7..585ad8222043e0546b1f80ecf7fc1bc0bda88176 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,6
+1,7
@@
*.sw*
*~
-assets/
+# assets/
+dlux-web/**/assets/
build/
bin/
node_modules/
@@
-33,4
+34,4
@@
target/
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+hs_err_pid*
\ No newline at end of file