Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

arc12012 · Apr 13, 2017 · 2b0ecdc · 2b0ecdc
2 parents 87230c7 + c4ec0a7
commit 2b0ecdc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 61 deletions.
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
@@ -26,11 +26,6 @@
 		</ul>
 	</div>
 	<%
-
-	Mail mail = new Mail();
-	mail.send();
-
-
 	Cookie[] usercookies = request.getCookies();
 	String navsso = "invalid";
 	String navname = "error";

diff --git a/WebContent/html/webpages/navbar.jspf b/WebContent/html/webpages/navbar.jspf