Merge branch 'master' of https://github.com/tabler/tabler-icons into dev

 Conflicts:

	gulpfile.js

	icons/arrow-bottom-bar.svg

	icons/arrow-bottom-circle.svg

	icons/arrow-bottom-square.svg

	icons/arrow-bottom-tail.svg

	icons/arrow-left-bar.svg

	icons/arrow-left-circle.svg

	icons/arrow-left-square.svg

	icons/arrow-left-tail.svg

	icons/arrow-right-bar.svg

	icons/arrow-right-circle.svg

	icons/arrow-right-square.svg

	icons/arrow-right-tail.svg

	icons/arrow-top-bar.svg

	icons/arrow-top-circle.svg

	icons/arrow-top-square.svg

	icons/arrow-top-tail.svg

	icons/arrows-down-up.svg

	icons/arrows-down.svg

	icons/arrows-left-right.svg

	icons/arrows-left.svg

	icons/arrows-right-left.svg

	icons/arrows-right.svg

	icons/arrows-up-down.svg

	icons/arrows-up.svg

	icons/brand-booking.svg

	icons/credit-card-off.svg

	icons/file-alert.svg

	icons/file-analytics.svg

	icons/layout-grid-add.svg

	icons/pizza.svg

	icons/square-rotated.svg

	package.json

	src/_icons/arrow-bottom-bar.svg

	src/_icons/arrow-bottom-circle.svg

	src/_icons/arrow-bottom-square.svg

	src/_icons/arrow-bottom-tail.svg

	src/_icons/arrow-left-bar.svg

	src/_icons/arrow-left-circle.svg

	src/_icons/arrow-left-square.svg

	src/_icons/arrow-left-tail.svg

	src/_icons/arrow-loop-left.svg

	src/_icons/arrow-loop-right.svg

	src/_icons/arrow-right-bar.svg

	src/_icons/arrow-right-circle.svg

	src/_icons/arrow-right-square.svg

	src/_icons/arrow-right-tail.svg

	src/_icons/arrow-top-bar.svg

	src/_icons/arrow-top-circle.svg

	src/_icons/arrow-top-square.svg

	src/_icons/arrow-top-tail.svg

	src/_icons/arrow-wave-left-down.svg

	src/_icons/arrow-wave-left-up.svg

	src/_icons/arrow-wave-right-down.svg

	src/_icons/arrow-wave-right-up.svg

	src/_icons/arrows-down-up.svg

	src/_icons/arrows-down.svg

	src/_icons/arrows-join-2.svg

	src/_icons/arrows-join.svg

	src/_icons/arrows-left-right.svg

	src/_icons/arrows-left.svg

	src/_icons/arrows-right-left.svg

	src/_icons/arrows-right.svg

	src/_icons/arrows-split-2.svg

	src/_icons/arrows-split.svg

	src/_icons/arrows-up-down.svg

	src/_icons/arrows-up.svg

	src/_icons/bell-off.svg

	src/_icons/bell-ringing-2.svg

	src/_icons/bone.svg

	src/_icons/brand-asana.svg

	src/_icons/brand-bing.svg

	src/_icons/brand-bitbucket.svg

	src/_icons/brand-booking.svg

	src/_icons/brand-disqus.svg

	src/_icons/brand-docker.svg

	src/_icons/brand-google-analytics.svg

	src/_icons/brand-gravatar.svg

	src/_icons/brand-hipchat.svg

	src/_icons/brand-kickstarter.svg

	src/_icons/brand-netflix.svg

	src/_icons/brand-open-source.svg

	src/_icons/brand-pagekit.svg

	src/_icons/brand-patreon.svg

	src/_icons/brand-producthunt.svg

	src/_icons/brand-sass.svg

	src/_icons/brand-sentry.svg

	src/_icons/brand-shazam.svg

	src/_icons/brand-stripe.svg

	src/_icons/brand-unsplash.svg

	src/_icons/brand-ycombinator.svg

	src/_icons/file-alert.svg

	src/_icons/file-analytics.svg

	src/_icons/file-code-2.svg

	src/_icons/file-export.svg

	src/_icons/file-import.svg

	src/_icons/layout-grid-add.svg

	src/_icons/pizza.svg

	src/_icons/rainbow.svg

	src/_icons/square-rotated.svg

	src/_icons/switch-2.svg

	src/_icons/switch-3.svg

	src/_icons/trending-down-2.svg

	src/_icons/trending-down-3.svg

	src/_icons/trending-up-2.svg

	src/_icons/trending-up-3.svg

	tags.json

1 files changed, 12 insertions, 0 deletions

diff --git a/icons-react/icons-js/brand-hipchat.js b/icons-react/icons-js/brand-hipchat.js
new file mode 100644
index 00000000..6fcc4e8a
--- /dev/null
+++ b/icons-react/icons-js/brand-hipchat.js
@@ -0,0 +1,12 @@
+import * as React from "react";
+
+function IconBrandHipchat({
+  size = 24,
+  color = "currentColor",
+  stroke = 2,
+  ...props
+}) {
+  return <svg className="icon icon-tabler icon-tabler-brand-hipchat" width={size} height={size} viewBox="0 0 24 24" strokeWidth={stroke} stroke={color} fill="none" strokeLinecap="round" strokeLinejoin="round" {...props}><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M17.802 17.292s.077 -.055 .2 -.149c1.843 -1.425 2.998 -3.49 2.998 -5.789c0 -4.286 -4.03 -7.764 -8.998 -7.764c-4.97 0 -9.002 3.478 -9.002 7.764c0 4.288 4.03 7.646 9 7.646c.424 0 1.12 -.028 2.088 -.084c1.262 .82 3.104 1.493 4.716 1.493c.499 0 .734 -.41 .414 -.828c-.486 -.596 -1.156 -1.551 -1.416 -2.29z" /><path d="M7.5 13.5c2.5 2.5 6.5 2.5 9 0" /></svg>;
+}
+
+export default IconBrandHipchat;
\ No newline at end of file