Merge branch 'next' of https://github.com/WebGoat/WebGoat into next

Conflicts:
	.gitignore
This commit is contained in:
diver-sity
2014-09-10 21:25:45 +10:00
313 changed files with 568 additions and 223 deletions

15
.gitignore vendored
View File

@ -1,5 +1,18 @@
/nb-configuration.xml
/nbactions.xml
/target/
/.classpath
/.project
/.settings/.jsdtscope
/.settings/org.eclipse.jdt.core.prefs
/.settings/org.eclipse.m2e.core.prefs
/.settings/org.eclipse.wst.common.component
/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
/.settings/org.eclipse.wst.common.project.facet.core.xml
/.settings/org.eclipse.wst.jsdt.ui.superType.container
/.settings/org.eclipse.wst.jsdt.ui.superType.name
/.settings/org.eclipse.wst.validation.prefs
/.externalToolBuilders/
.project
/target
.classpath
@ -11,5 +24,3 @@ src/main/main.iml
*.LOCAL.*.jsp
*.REMOTE.*.jsp