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

elaOnMars · Sep 12, 2014 · 5978b63 · 5978b63
2 parents ebae696 + e5b142c
commit 5978b63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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;
 }
 /* ==========================================================================