Merge pull request #358 from dmtrKovalenko/develop

Release 1.0.0-rc.6
mui · Apr 14, 2018 · cd44c06 · cd44c06
2 parents 53a91a3 + a04edc0
commit cd44c06
Show file tree

Hide file tree

Showing 25 changed files with 819 additions and 124 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,7 @@ yarn-error.log*
 .idea/
 /lib/yarn.lock
 /docs/yarn.lock
+
+# editors
+.vs
+.vscode
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/README.md b/README.md
@@ -15,14 +15,17 @@ Now choose the library that pickers will use to work with date. We are providing
 ```sh
 npm install date-fns@next -s
 // or
-npm install moment -S
+npm install moment -s
+// or
+npm i luxon -s
 ```
 
-Then teach pickers which library to use with `MuiPickerUtilsProvider`.This component takes an utils property, and makes it available down the React tree thanks to React context. It should preferably be used at the root of your component tree.
+Then teach pickers which library to use with `MuiPickerUtilsProvider`. This component takes an utils property, and makes it available down the React tree thanks to React context. It should preferably be used at the root of your component tree.
 
 ```jsx
 import MomentUtils from 'material-ui-pickers/utils/moment-utils';
 import DateFnsUtils from 'material-ui-pickers/utils/date-fns-utils';
+import LuxonUtils from 'material-ui-picker/luxon-utils;
 import MuiPickersUtilsProvider from 'material-ui-pickers/utils/MuiPickersUtilsProvider';
 
 function App() {

diff --git a/docs/package-lock.json b/docs/package-lock.json