Merged master, resolved conflicts

bvaughn · Jul 20, 2017 · 4f6f3d1 · 4f6f3d1
2 parents c36da4b + ec0bd80
commit 4f6f3d1
Show file tree

Hide file tree

Showing 14 changed files with 699 additions and 481 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -1,10 +1,8 @@
 [ignore]
-.*/node_modules/.*
 .*/ArrowKeyStepper/.*
 .*/AutoSizer/.*
 .*/Collection/.*
 .*/ColumnSizer/.*
-.*/Grid/.*
 .*/InfiniteLoader/.*
 .*/List/.*
 .*/Masonry/.*

diff --git a/source/Grid/Grid.example.js b/source/Grid/Grid.example.js
@@ -1,4 +1,3 @@
-/** @flow */
 import Immutable from "immutable";
 import PropTypes from "prop-types";
 import React, { PureComponent } from "react";