Skip to content

Commit

Permalink
Merge branch 'master' into james/support-flyte-deck
Browse files Browse the repository at this point in the history
  • Loading branch information
james-union authored Jun 13, 2022
2 parents be33869 + 1013deb commit 25f5a08
Show file tree
Hide file tree
Showing 3 changed files with 1,239 additions and 347 deletions.
4 changes: 2 additions & 2 deletions packages/zapp/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"lint-staged": "^7.0.4",
"lossless-json": "^1.0.3",
"memoize-one": "^5.0.0",
"moment": "^2.29.2",
"moment": "^2.29.3",
"moment-timezone": "^0.5.28",
"msw": "^0.24.1",
"notistack": "^1.0.10",
Expand All @@ -145,7 +145,7 @@
"react-router-dom": "^5.0.1",
"react-virtualized": "^9.21.1",
"resolve-url-loader": "^5.0.0",
"semantic-release": "^17.2.3",
"semantic-release": "^19.0.3",
"shallowequal": "^1.1.0",
"snakecase-keys": "^5.4.2",
"source-map-loader": "^3.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as moment from 'moment';
import { FilterOperationName } from 'models/AdminEntity/types';
import moment from 'moment';
import { FilterMap } from './types';

const workflowExecutionStartTimeKey = 'execution_created_at';
Expand Down
Loading

0 comments on commit 25f5a08

Please sign in to comment.