From 045aeda1e3ca0e3c7b8bf01f03c5e70150134d62 Mon Sep 17 00:00:00 2001
From: Roman Rei_ <me@silverwind.io>
Date: Mon, 10 Mar 2014 19:30:22 +0100
Subject: [PATCH] CSS: Add flex-grow and flex-shrink to cssNumber

Fixes #14888
Closes gh-1536
(cherry picked from commit c29e9c4db18738f7bfeb6b4a8019121a9079beb6)
---
 .mailmap    | 1 +
 AUTHORS.txt | 1 +
 src/css.js  | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index 576f2fb4c..1b7dcf677 100644
--- a/.mailmap
+++ b/.mailmap
@@ -72,6 +72,7 @@ Richard D. Worth <rdworth@gmail.com>
 Rick Waldron <waldron.rick@gmail.com>
 Rick Waldron <waldron.rick@gmail.com> <rick@bocoup.com>
 Robert Katić <robert.katic@gmail.com>
+Roman Reiß <me@silverwind.io>
 Ron Otten <r.j.g.otten@gmail.com>
 Sai Lung Wong <sai.wong@huffingtonpost.com>
 Scott González <scott.gonzalez@gmail.com> <sgonzale@sgonzale-laptop.local>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 07fb5710d..9c734c4ef 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -207,3 +207,4 @@ cjqed <christopherjonesqed@gmail.com>
 Forbes Lindesay <forbes@lindesay.co.uk>
 John Paul <john@johnkpaul.com>
 S. Andrew Sheppard <andrew@wq.io>
+Roman Reiß <me@silverwind.io>
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,
-- 
2.39.5