# Conflicts:
#	src/main/java/org/jabref/gui/entryeditor/SourceTab.java

* upstream/master:
  Initializing EntryEditor Tabs on focus (JabRef#3331)
  Fix JabRef#3292: annotations are now automatically refreshed (JabRef#3325)
  Change integrity message for names depending on database mode (JabRef#3330)
  Fix location bundle with fast access (JabRef#3327)
  Small code cleanup
  Fix "path not found" exception
  Small fix in drag and drop handler of linked files (JabRef#3328)

# Conflicts:
#	src/main/java/org/jabref/gui/DefaultInjector.java

Improved gui layout consistency
Remove unused exception from shared db

* upstream/master:
  update mockito-core from 2.10.0 -> 2.11.0 (JabRef#3338)
  Remove underscore in Localized messages (JabRef#3336)
  Localisation: French: new entries translated (JabRef#3337)
  Refactoring: Lazy init of all editor tabs (JabRef#3333)

disable after connect (fully disabled until restart)

try around with BibTexImporter

Improve equals and hashcode in DBMSProperties

* upstream/master:
  Source tab entry duplication (JabRef#3360)

* upstream/master: (22 commits)
  Improve SyncLang.py (JabRef#3184)
  Config intellj code style to adhere to empty lines checkstyle rule (JabRef#3365)
  Don't list same look and feels more than once (JabRef#3393)
  progessdialog and result table are now shown correclty on copy files
  Export pdf/linked files  (JabRef#3147)
  Added checking integrity dialog (JabRef#3388)
  Update richtext and flowless (JabRef#3386)
  Source tab: hide notification pane when code is correct again (JabRef#3387)
  Titles are optional at crossref (JabRef#3378)
  Update entry for every change in the source panel (JabRef#3366)
  Rework AutoSetFileLinks (JabRef#3368)
  revert wrongly commited changes
  Refactorings (JabRef#3370)
  Fix freezing when running cleanup file operations like rename (JabRef#3315)
  This additional style setting for IDEA (JabRef#3355)
  Fix checkstyle
  Add proper equals to content selector
  Delete unused code
  Extract difference finder from gui to logic
  Remove unnecessary EntrySorter
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/entryeditor/SourceTab.java

* upstream/master: (26 commits)
  Fix test for quoted lang messages (JabRef#3424)
  Update gradle from 4.3 to 4.3.1
  Fix JabRef#3411: ordering of fields in customized entry types works again (JabRef#3422)
  Backport of syncLang to python2 (JabRef#3420)
  Remove Versioneye badge
  Fix some error prone warnings
  Fix for issue JabRef#2721 append to a field (JabRef#3395)
  Fix travis - hopefully
  Remove 3.x changelog (JabRef#3250)
  Try to use hint of https://github.com/TheBoegl/shadow-log4j-transformer#usage-as-library
  Try to enable LGTM
  Update guava from 23.2 -> 23.3 (JabRef#3409)
  Update wiremock from 2.8.0 -> 2.10.1
  Move groups field from others to general (JabRef#3407)
  Fix checkstyle issues to repair build
  Fix JabRef#3046: No longer allow duplicate fields in customized entry types (JabRef#3405)
  Strip invalid prolog when loading CitationStyles (JabRef#3404)
  Integrity check "Abbreviation Detection" detects abbreviated names for journals and booktitles based on the internal list instead of only looking for "." signs. (JabRef#3362)
  Update gradle from 4.2.1 to 4.3
  Update gradle from 4.2.1 to 4.3
  ...

* upstream/master: (108 commits)
  Fetcher for IACR eprints (JabRef#3473)
  Update internal state of DatabaseChangeMonitor when external changes … (JabRef#3503)
  Fixes JabRef#3505: Another try to fix the NPE in the search bar (JabRef#3512)
  Replace ' with ' so that our HTML preview can handle it correctly
  Added a "Clear text" button in right click menu within the text boxes. (JabRef#3475)
  Add reset to English language after a test
  New translations JabRef_en.properties (German)
  Remove ampersand in non-menu localizations
  New translations JabRef_en.properties (German)
  New translations Menu_en.properties (German)
  New translations Menu_en.properties (German)
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Italian)
  New translations Menu_en.properties (Italian)
  New translations JabRef_en.properties (Indonesian)
  New translations Menu_en.properties (Indonesian)
  New translations JabRef_en.properties (Greek)
  New translations Menu_en.properties (Greek)
  New translations Menu_en.properties (Japanese)
  New translations JabRef_en.properties (German)
  ...

# Conflicts:
#	build.gradle

* upstream/master: (121 commits)
  Fix fetcher tests (JabRef#3583)
  Convert entry preview panel to JavaFX (JabRef#3574)
  Remove dependency for JUnit4 (JabRef#3580)
  Update tracis cache config as recommned by the docs (JabRef#3575)
  fix typo
  Show development information
  Release v4.1
  Add new authors to mailMap (JabRef#3567)
  Fix build
  Really fix changelog
  Fix changelog
  Minor changes
  Disable the autocompletion as default (JabRef#3569)
  Add update exception for applicationinsights 2.0.0-BETA (JabRef#3571)
  Install4j jres 152 (JabRef#3570)
  Fix grammar mistake
  Downgrade applicationinsights. Fixes JabRef#3561
  Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (JabRef#3568)
  ExportFormats: Use FileExtension enum (JabRef#3565)
  Update guava from 23.5-jre -> 23.6-jre
  ...

# Conflicts:
#	build.gradle

* upstream/master: (155 commits)
  Update DEVELOPERS
  Update README.md
  [WIP] File link deletion dialog improvements (JabRef#3690)
  Update guava (JabRef#3692)
  Fix some FX  Thread issue (JabRef#3691)
  Fixed typo, mayor to major (JabRef#3685)
  add Office xml test for latex free fields (JabRef#3680)
  Migrate importer tests to JUnit5 (JabRef#3665)
  fix typo
  Update slf4j-api from 1.8.0-beta0 -> 1.8.0-beta1
  Update richtext from 0.8.1 -> 0.8.2
  Update junit from 5.1.0-M1 -> 5.1.0-M2
  Update checkstyle from 8.7 -> 8.8
  Export all fields with their latex free equivalent (JabRef#3675)
  try around with exckluding tag (JabRef#3676)
  Fixes JabRef#3648: Chained modifiers work again (JabRef#3670)
  Update gradle from 4.4.1 to 4.5 and tweak .gitattributes
  Fix 2633 saving creates new database (JabRef#3674)
  New translations JabRef_en.properties (French)
  Implements JabRef#1664: group based on aux file (JabRef#3444)
  ...

# Conflicts:
#	CHANGELOG.md
#	CONTRIBUTING.md
#	build.gradle
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	scripts/syncLang.py
#	src/main/java/org/jabref/FallbackExceptionHandler.java
#	src/main/java/org/jabref/Globals.java
#	src/main/java/org/jabref/JabRefMain.java
#	src/main/java/org/jabref/cli/ArgumentProcessor.java
#	src/main/java/org/jabref/cli/JabRefCLI.java
#	src/main/java/org/jabref/collab/EntryChange.java
#	src/main/java/org/jabref/collab/EntryDeleteChange.java
#	src/main/java/org/jabref/collab/FileUpdateListener.java
#	src/main/java/org/jabref/collab/StringAddChange.java
#	src/main/java/org/jabref/collab/StringChange.java
#	src/main/java/org/jabref/collab/StringNameChange.java
#	src/main/java/org/jabref/collab/StringRemoveChange.java
#	src/main/java/org/jabref/gui/BasePanel.java
#	src/main/java/org/jabref/gui/ClipBoardManager.java
#	src/main/java/org/jabref/gui/DefaultInjector.java
#	src/main/java/org/jabref/gui/DialogService.java
#	src/main/java/org/jabref/gui/EntryTypeDialog.java
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
#	src/main/java/org/jabref/gui/collab/ChangeScanner.java
#	src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
#	src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
#	src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
#	src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
#	src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
#	src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
#	src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
#	src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
#	src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
#	src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
#	src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
#	src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
#	src/main/java/org/jabref/gui/entryeditor/SourceTab.java
#	src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
#	src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabController.java
#	src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
#	src/main/java/org/jabref/gui/exporter/ExportAction.java
#	src/main/java/org/jabref/gui/exporter/ExportFileFilter.java
#	src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
#	src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
#	src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
#	src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
#	src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
#	src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
#	src/main/java/org/jabref/gui/groups/GroupDialog.java
#	src/main/java/org/jabref/gui/groups/GroupSidePane.java
#	src/main/java/org/jabref/gui/groups/GroupTreeController.java
#	src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
#	src/main/java/org/jabref/gui/help/HelpAction.java
#	src/main/java/org/jabref/gui/importer/ImportFileFilter.java
#	src/main/java/org/jabref/gui/importer/ImportFormats.java
#	src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
#	src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
#	src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java
#	src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
#	src/main/java/org/jabref/gui/search/GlobalSearchBar.java
#	src/main/java/org/jabref/gui/util/BindingsHelper.java
#	src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
#	src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
#	src/main/java/org/jabref/gui/util/FileUpdateListener.java
#	src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java
#	src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
#	src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java
#	src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
#	src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
#	src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
#	src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
#	src/main/java/org/jabref/logic/exporter/ExportFormats.java
#	src/main/java/org/jabref/logic/exporter/IExportFormat.java
#	src/main/java/org/jabref/logic/exporter/MSBibExporter.java
#	src/main/java/org/jabref/logic/exporter/ModsExporter.java
#	src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
#	src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
#	src/main/java/org/jabref/logic/exporter/TemplateExporter.java
#	src/main/java/org/jabref/logic/importer/ImportFormatReader.java
#	src/main/java/org/jabref/logic/importer/WebFetchers.java
#	src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
#	src/main/java/org/jabref/logic/integrity/FieldCheckers.java
#	src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
#	src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
#	src/main/java/org/jabref/logic/shared/DBMSProcessor.java
#	src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
#	src/main/java/org/jabref/logic/util/FileType.java
#	src/main/java/org/jabref/logic/util/JavaVersion.java
#	src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java
#	src/main/java/org/jabref/logic/util/io/FileFinder.java
#	src/main/java/org/jabref/logic/util/io/FileUtil.java
#	src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
#	src/main/java/org/jabref/model/auxparser/AuxParserResult.java
#	src/main/java/org/jabref/model/database/BibDatabaseContext.java
#	src/main/java/org/jabref/model/entry/FieldProperty.java
#	src/main/java/org/jabref/model/pdf/FileAnnotation.java
#	src/main/java/org/jabref/model/util/FileUpdateListener.java
#	src/main/java/org/jabref/preferences/CustomExportList.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
#	src/test/java/org/jabref/TestArchitectureTests.java
#	src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
#	src/test/java/org/jabref/gui/importer/EntryFromFileCreatorManagerTest.java
#	src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
#	src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
#	src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
#	src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
#	src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
#	src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
#	src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
#	src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
#	src/test/java/org/jabref/logic/importer/fileformat/FreeCiteImporterTest.java
#	src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
#	src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
#	src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
#	src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
#	src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
#	src/test/java/org/jabref/logic/shared/SynchronizationTestEventListener.java
#	src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
#	src/test/java/org/jabref/logic/shared/TestConnector.java
#	src/test/java/org/jabref/logic/util/BracketedPatternTest.java
#	src/test/java/org/jabref/logic/util/io/CiteKeyBasedFileFinderTest.java
#	src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTests.java
#	src/test/java/org/jabref/testutils/category/FetcherTest.java

* upstream/master: (47 commits)
  Fix Google Scholar fetcher
  Use english for all LCID mappings JabRef#1851
  remove import preferences test mock import and convert to junit5
  fix JabRef#3693 (JabRef#3702)
  Fix space leads to jump in entry editor (JabRef#3699)
  Fix JabRef#3669
  Extract creation of the contents of FileAnnotationTabController
  Fix changelog
  Fix NPE
  Remove unnecessary file
  use processbuilder for calling external apps
  Fix color highlight of odd linked files
  Fixes JabRef#2964
  Fix koppor issues #3
  Allow spaces in DOIs
  Remove irrelevant log messages during XMP reading
  Adapt log4j configuration for cleaner junit tests JabRef#3511
  Eclipse Django style JabRef#3655
  Better code style for chained methods
  Update build.gradle
  ...

* 'sharelatex' of github.com:JabRef/jabref:
  Add method for getting entry from position

* upstream/master:
  Improve Google Scholar fulltext finder
  Fixes JabRef#3705 Match and save file description
  Add coauthors JabRef#3706
  Update Authors
  Co-authored-by: Stefan Kolb <stefan-kolb@web.de>

* 'sharelatex' of github.com:JabRef/jabref:
  Refactor ShareLatexPreferences

* upstream/master: (94 commits)
  Add missing localization for Any file
  Refactor dublin core utility (JabRef#3756)
  Add Localization
  Update Architecture Tests to catch static imports (JabRef#3766)
  Added <any file type> to the Import File Filter Dialog.
  Don't trim when migrating review field (JabRef#3761)
  Reorder again
  Rename confirmation into "Merge fields"
  Fix logic
  Reorder checklist in PR template and add "good commit message"
  Replace x11 by unity7
  Include desktop, desktop-legacy, wayland in snapcraft.yaml
  Improve Dublin Core (JabRef#3710)
  Incorporate suggestions by @Siedlerchr
  Update JUnit from 5.1.0-M2 -> 5.1.0
  Update Mockito from 2.13.0 -> 2.15.0
  Update wiremock from 2.14.0 -> 2.15.0
  Fix exceptions for jacoco
  update gradle
  Add link to contribute.jabref.org (JabRef#3748)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java

Fix preferences loading
Return false on boolean prefs get default if no entry is found

# Conflicts:
#	build.gradle
#	src/main/java/org/jabref/gui/DefaultInjector.java
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
#	src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java
#	src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
#	src/main/java/org/jabref/model/database/event/CoarseChangeFilter.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
#	src/main/java/org/jabref/preferences/PreferencesService.java

* upstream/master:
  remove wrong dependencies
  add missing dependencies

fix test

TODO: fix db writers and get string output back
TODO: Fix merge dialog

# Conflicts:
#	build.gradle

# Conflicts:
#	build.gradle
#	src/main/java/org/jabref/Globals.java
#	src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java

- Add to menu
- Fix dialog
- Replace org.bitbucket.cowwoc.diff-match-patch by java-diff-utils
- Fix dependency tyrus-standalone-client --> tyrus-client b/c of module conflicts
- Build JSON object using Gson

Co-authored-by: Manuel Fritz <developer@fritzman.de>

# Conflicts:
#	build.gradle
#	external-libraries.md
#	src/main/java/module-info.java
#	src/main/java/org/jabref/gui/Globals.java
#	src/main/java/org/jabref/gui/actions/StandardActions.java
#	src/main/java/org/jabref/model/database/event/CoarseChangeFilter.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java

Co-authored-by: Manuel Fritz <developer@fritzman.de>

Make login to overleaf working
Fix test imports

* upstream/master:
  Reimport -> Reload (JabRef#6874)

fix npe lastname is now email

* upstream/master: (164 commits)
  Bump lucene-queryparser from 8.6.3 to 8.7.0 (JabRef#7089)
  Fix endnote importer when keyword style is null (JabRef#7084)
  Rename Firefox extension file in Windows (JabRef#7092)
  Add support for Microsoft Edge browser in Windows and Linux builds (JabRef#7056)
  Bump unirest-java from 3.11.03 to 3.11.05 (JabRef#7087)
  Bump com.github.ben-manes.versions from 0.33.0 to 0.36.0 (JabRef#7088)
  Bump gittools/actions from v0.9.4 to v0.9.5 (JabRef#7091)
  Feature/add abstract field to complex search (JabRef#7079)
  Add missing authors
  Implement Emacs key bindings (JabRef#6037)
  Special field code maintenance (JabRef#7078)
  Follow up fix for 7077 Reset preview layouts on clear
  Fix preview settings not saved due to l10n (JabRef#7077)
  Add link to existing documentation of filed types
  Remove unused supportsPaging
  Squashed 'src/main/resources/csl-styles/' changes from 5c376b8..f4399aa
  Fix more 404 links
  Fix custom theme styles not applied to the entry preview (JabRef#7071)
  Fix Shared Database Tests (JabRef#7040)
  Bump byte-buddy-parent from 1.10.17 to 1.10.18 (JabRef#7059)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/DefaultInjector.java

* upstream/master: (217 commits)
  Fix handling of URL in file field (JabRef#7347)
  Fix expansion of bracketed expressions in RegExpBasedFileFinder (JabRef#7338)
  Refactor unlinked files (JabRef#7209)
  Add pressing enter when the search field is focused as a way to trigger search (JabRef#7377)
  Upgrade citeproc to 3.x snapshot without graal (JabRef#7370)
  Fix Exception if no AzureInstrumentationKey is available (JabRef#7373)
  Update snapcraft source url (JabRef#7372)
  Fix checkstyle and adjust language
  GitBook: [master] 3 pages and 32 assets modified
  Add migration to special field (JabRef#7368)
  GitBook: [master] 5 pages and 29 assets modified
  Modify message at the duplicates found dialog (JabRef#7231)
  Fixes miss-parsed names in `AutomaticPersonsGroup` (JabRef#7228)
  Fix an issue where the password for a shared SQL database was only remembered if it was the same as the username (JabRef#7364)
  Fix harvard exporter by changing AuthorsFormatter (JabRef#7355)
  Bump styfle/cancel-workflow-action from 0.6.0 to 0.7.0 (JabRef#7363)
  Bump mockito-core from 3.7.0 to 3.7.7 (JabRef#7360)
  Bump org.beryx.jlink from 2.23.1 to 2.23.2 (JabRef#7361)
  Bump libreoffice from 7.0.3 to 7.0.4 (JabRef#7362)
  Export full month name instead of number in ms office (JabRef#7358)
  ...

# Conflicts:
#	external-libraries.md
#	src/main/java/module-info.java
#	src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java

adjust user agent

# Conflicts:
#	external-libraries.md
#	src/main/java/module-info.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java

# Conflicts:
#	build.gradle
#	docs/code-howtos/overleaf.md
#	src/main/java/module-info.java
#	src/main/java/org/jabref/gui/DefaultInjector.java
#	src/main/java/org/jabref/gui/Globals.java
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/actions/StandardActions.java
#	src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
#	src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
#	src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java