Skip to content

Conversation

@koppor
Copy link
Member

@koppor koppor commented Jan 1, 2024

Automated changes by create-pull-request GitHub action

@koppor koppor added the dev: dependencies Pull requests that update a dependency file label Jan 1, 2024
@koppor koppor enabled auto-merge January 1, 2024 02:19
@koppor koppor added this pull request to the merge queue Jan 1, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Jan 1, 2024

The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build.

Merged via the queue into main with commit adb3732 Jan 1, 2024
@koppor koppor deleted the refresh-csl branch January 1, 2024 02:43
Siedlerchr added a commit to jlauber18/jabref that referenced this pull request Jan 1, 2024
* upstream/main: (334 commits)
  Update CSL styles (JabRef#10734)
  Fix the preview panel showing the wrong entry (an entry that is not selected in the entry table) (JabRef#10728)
  Fix cancelling ignored when generating an entry from id (JabRef#10727)
  Merge split localization string (JabRef#10712)
  Downgrade jfx 21.0.1 to jfx 21
  Bump actions/upload-pages-artifact from 2 to 3 (JabRef#10723)
  Bump actions/deploy-pages from 3 to 4 (JabRef#10722)
  Bump org.glassfish.jersey.core:jersey-server from 3.1.4 to 3.1.5 (JabRef#10720)
  Bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml (JabRef#10717)
  Bump org.apache.pdfbox:pdfbox from 3.0.0 to 3.0.1 (JabRef#10721)
  Bump org.postgresql:postgresql from 42.6.0 to 42.7.1 (JabRef#10718)
  Bump org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2 (JabRef#10719)
  update snapcraft update bug report template
  Show development information
  Release v5.12
  Release v5.12
  add jspecify
  exclude junit jupiter
  Add external libraries
  Update CSL styles (JabRef#10714)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
#	src/main/java/org/jabref/preferences/GuiPreferences.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dev: dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants