diff options
author | 2019-04-03 17:08:49 +0200 | |
---|---|---|
committer | 2019-04-03 17:08:49 +0200 | |
commit | fc4988cd5e54f44779f13732961a3f7b00619eaf (patch) | |
tree | 9e39d2d3baabba44a50cbde3649045579a51d7f6 /packages/forms | |
parent | add workspace premium badge in settings nav (diff) | |
parent | fix shitty twitter account typo (diff) | |
download | ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.gz ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.zst ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.zip |
fixes conflicts with latest develop
Diffstat (limited to 'packages/forms')
-rw-r--r-- | packages/forms/package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/forms/package.json b/packages/forms/package.json index fe161a282..8c21303f4 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/forms", | 2 | "name": "@meetfranz/forms", |
3 | "version": "1.0.13", | 3 | "version": "1.0.14", |
4 | "description": "React form components for Franz", | 4 | "description": "React form components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
@@ -25,7 +25,7 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "@meetfranz/theme": "^1.0.11", | 28 | "@meetfranz/theme": "^1.0.12", |
29 | "react-html-attributes": "^1.4.3", | 29 | "react-html-attributes": "^1.4.3", |
30 | "react-loader": "^2.4.5" | 30 | "react-loader": "^2.4.5" |
31 | }, | 31 | }, |
@@ -35,5 +35,5 @@ | |||
35 | "react-dom": "16.7.0", | 35 | "react-dom": "16.7.0", |
36 | "react-jss": "^8.6.1" | 36 | "react-jss": "^8.6.1" |
37 | }, | 37 | }, |
38 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" | 38 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" |
39 | } | 39 | } |