Skip to content

Commit

Permalink
Merge branch 'app/painless' of github.com:elastic/kibana into minor-r…
Browse files Browse the repository at this point in the history
…efactor

* 'app/painless' of github.com:elastic/kibana:
  Add query parameter to score context (elastic#60414)

# Conflicts:
#	x-pack/plugins/painless_lab/public/application/common/types.ts
#	x-pack/plugins/painless_lab/public/application/components/main.tsx
#	x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
#	x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
#	x-pack/plugins/painless_lab/public/application/lib/format.ts
  • Loading branch information
jloleysens committed Mar 18, 2020
2 parents 587b221 + f5bec8e commit bd1f74b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit bd1f74b

Please sign in to comment.