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

act-ive · act-ive · commit 5978b631565c · 2014-09-13T07:13:20.000+10:00
diff --git a/src/main/webapp/WEB-INF/pages/about.jsp b/src/main/webapp/WEB-INF/pages/about.jsp
@@ -57,7 +57,7 @@
                 <ul>
                     <li>Nanne Baars (Developer)</li>
                     <li>Dave Cowden (Everything)</li>
-                    <li>Keith Gasser (Survey)</li>
+                    <li>Keith Gasser (Survey/Security)</li>
                     <li>Li Simon (Developer)</li>
                 </ul>
                 </p>
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css
@@ -726,7 +726,7 @@ fieldset[disabled] .btn-warning.active {
   margin-bottom: 5px;
 }
 .modal .modal-body.modal-scroll {
-  max-height: 350px;
+  max-height: 375px;
   overflow-y: auto;
 }
 /* ==========================================================================

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ fieldset[disabled] .btn-warning.active {`
`726`	`726`	`margin-bottom: 5px;`
`727`	`727`	`}`
`728`	`728`	`.modal .modal-body.modal-scroll {`
`729`		`- max-height: 350px;`
	`729`	`+ max-height: 375px;`
`730`	`730`	`overflow-y: auto;`
`731`	`731`	`}`
`732`	`732`	`/* ==========================================================================`