Skip to content

FIX NPE on Merge Dialog#8380

Merged
calixtus merged 1 commit into
mainfrom
fixMergeEntry
Jan 3, 2022
Merged

FIX NPE on Merge Dialog#8380
calixtus merged 1 commit into
mainfrom
fixMergeEntry

Conversation

@Siedlerchr

@Siedlerchr Siedlerchr commented Jan 3, 2022

Copy link
Copy Markdown
Member

Quick fix

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 3, 2022
@calixtus calixtus merged commit 617c5a1 into main Jan 3, 2022
@calixtus calixtus deleted the fixMergeEntry branch January 3, 2022 18:40
Siedlerchr added a commit that referenced this pull request Jan 4, 2022
* upstream/main:
  Observable Preferences J (Preview) and minor refactor (#8370)
  quickfix (#8383)
  Live reloading when switching themes (#7336)
  FIX NPE on Merge Dialog (#8380)
  Bump org.eclipse.jgit from 5.13.0.202109080827-r to 6.0.0.202111291000-r (#8378)
  Bump jackson-dataformat-yaml from 2.13.0 to 2.13.1 (#8379)
  Bump tika-core from 2.2.0 to 2.2.1 (#8377)
  Update turabian-fullnote-bibliography-no-ibid.csl
  Squashed 'buildres/csl/csl-locales/' changes from d5ee85de8e..c38205618f
  Squashed 'buildres/csl/csl-styles/' changes from 60bf7d5..f78c707
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants