Merge ../pl into staging

2 files changed, 1 insertions, 1 deletions

diff --git a/js/wPaint b/js/wPaint
-Subproject 2c272dffca0f3d7b7163bd82ba15629f5440927
+Subproject 15bae4a9181ddb283c1cad0979c44cefd4f15a4
diff --git a/js/wpaint.js b/js/wpaint.js
index 93d29bbc..9c619070 100644
--- a/js/wpaint.js
+++ b/js/wpaint.js
@@ -83,7 +83,7 @@ oekaki.init = function() {
         stop: function(event,ui) {
           $("#wpaintdiv").wPaint("resize");
         },
-        alsoResize: "#wpaintdiv, #wpaintdiv canvas",
+        alsoResize: "#wpaintdiv",
       });
 
       $('#wpaintctr .ui-resizable-se').css({'height':'12px', 'width':'12px'});