Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bot] Update CSL styles #10714

Merged
merged 1 commit into from
Dec 23, 2023
Merged

[Bot] Update CSL styles #10714

merged 1 commit into from
Dec 23, 2023

Conversation

koppor
Copy link
Member

@koppor koppor commented Dec 23, 2023

Automated changes by create-pull-request GitHub action

@koppor koppor added the dev: dependencies Pull requests that update a dependency file label Dec 23, 2023
@koppor koppor enabled auto-merge December 23, 2023 14:39
@koppor koppor added this pull request to the merge queue Dec 23, 2023
Copy link
Contributor

github-actions bot commented Dec 23, 2023

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 3a60ff9 Dec 23, 2023
18 checks passed
@koppor koppor deleted the refresh-csl branch December 23, 2023 15:00
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.

2 participants