diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 16:40:11 +0200 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 16:40:11 +0200 |
| commit | fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4 (patch) | |
| tree | 2051271328c390be6c78b0a214c948e0c0c5f865 /packages/theme | |
| parent | add context menu for workspace drawer items (diff) | |
| parent | test package order (diff) | |
| download | ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.gz ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.zst ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.zip | |
merge conflicts with latest develop
Diffstat (limited to 'packages/theme')
| -rw-r--r-- | packages/theme/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/theme/package.json b/packages/theme/package.json index e3d1e7af1..642904089 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "@meetfranz/theme", | 2 | "name": "@meetfranz/theme", |
| 3 | "version": "1.0.12", | 3 | "version": "1.0.13", |
| 4 | "description": "Theme configuration for Franz", | 4 | "description": "Theme configuration for Franz", |
| 5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
| 6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
| @@ -25,5 +25,5 @@ | |||
| 25 | "dependencies": { | 25 | "dependencies": { |
| 26 | "color": "^3.1.0" | 26 | "color": "^3.1.0" |
| 27 | }, | 27 | }, |
| 28 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" | 28 | "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" |
| 29 | } | 29 | } |