aboutsummaryrefslogtreecommitdiffstats
path: root/packages/ui
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-04-03 17:08:49 +0200
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-04-03 17:08:49 +0200
commitfc4988cd5e54f44779f13732961a3f7b00619eaf (patch)
tree9e39d2d3baabba44a50cbde3649045579a51d7f6 /packages/ui
parentadd workspace premium badge in settings nav (diff)
parentfix shitty twitter account typo (diff)
downloadferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.gz
ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.zst
ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.zip
fixes conflicts with latest develop
Diffstat (limited to 'packages/ui')
-rw-r--r--packages/ui/package.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/ui/package.json b/packages/ui/package.json
index fb36555c4..d6c72f31f 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "@meetfranz/ui", 2 "name": "@meetfranz/ui",
3 "version": "0.0.6", 3 "version": "0.0.7",
4 "description": "React UI components for Franz", 4 "description": "React UI 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-loader": "^2.4.5" 29 "react-loader": "^2.4.5"
30 }, 30 },
31 "peerDependencies": { 31 "peerDependencies": {
@@ -34,5 +34,5 @@
34 "react-dom": "16.7.0", 34 "react-dom": "16.7.0",
35 "react-jss": "^8.6.1" 35 "react-jss": "^8.6.1"
36 }, 36 },
37 "gitHead": "27778954921365e4957eae964e28f68690f3825f" 37 "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77"
38} 38}