Merge branch 'master' of github.com:Elettronik/ExtJs4-Model-Generator

Conflicts: .gitignore
Elettronik · Aug 28, 2014 · 2e8fed2 · 2e8fed2
2 parents f8bf234 + 30fca38
commit 2e8fed2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,4 @@ hs_err_pid*
 .settings
 .classpath
 .project
-*.js
+*.js