diff --git a/.mailmap b/.mailmap index 576f2fb4c..1b7dcf677 100644 --- a/.mailmap +++ b/.mailmap @@ -72,6 +72,7 @@ Richard D. Worth Rick Waldron Rick Waldron Robert Katić +Roman Reiß Ron Otten Sai Lung Wong Scott González diff --git a/AUTHORS.txt b/AUTHORS.txt index 07fb5710d..9c734c4ef 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -207,3 +207,4 @@ cjqed Forbes Lindesay John Paul S. Andrew Sheppard +Roman Reiß diff --git a/src/css.js b/src/css.js index dcca4e953..1e454caf1 100644 --- a/src/css.js +++ b/src/css.js @@ -227,6 +227,8 @@ jQuery.extend({ cssNumber: { "columnCount": true, "fillOpacity": true, + "flexGrow": true, + "flexShrink": true, "fontWeight": true, "lineHeight": true, "opacity": true,