Merge branch 'next' of https://github.com/webgoat-atlassian/WebGoat-1 into next
Conflicts: src/main/webapp/js/application.js
This commit is contained in:
commit
710e3ee1ee
@ -11,7 +11,7 @@ var app = function() {
|
||||
sideBarLeftInit();
|
||||
window.onresize = function(){
|
||||
sideBarLeftInit();
|
||||
};
|
||||
}
|
||||
closePanel();
|
||||
};
|
||||
|
||||
@ -221,7 +221,6 @@ var app = function() {
|
||||
morrisPie: morrisPie,
|
||||
sideBarLeftInit:sideBarLeftInit
|
||||
};
|
||||
|
||||
|
||||
}();
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user