From 6801d666ae494092bcbb89a116e5acadccdf753e Mon Sep 17 00:00:00 2001
From: Konstantin Baierer <unixprog@gmail.com>
Date: Fri, 15 Dec 2023 13:28:41 +0100
Subject: [PATCH] update 2023-12-15

---
 CHANGELOG.md | 18 ++++++++++++++++--
 core         |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81241685..f125174e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## Unreleased
+
+## [v2023-12-15](https://github.com/OCR-D/ocrd_all/releases/v2023-12-15)
+
+### [core](https://github.com/OCR-D/core) [742906e](https://github.com/OCR-D/core/commits/742906e)..[4684d48](https://github.com/OCR-D/core/commits/4684d48)
+
+> Release: [v2.60.0](https://github.com/OCR-D/core/releases/v2.60.0)
+
+  > * :memo: changelog
+  > * Merge branch 'git-versioning'
+  > * :memo: changelog
+  > * defaults for mets_basename and mets_server_url
+  > * Merge branch 'master' of https://github.com/OCR-D/core
+  > * :memo: changelog
+  > * ocrd workpace list-page: ignore files without pageId, fix #1148
+
 ## [v2023-12-07](https://github.com/OCR-D/ocrd_all/releases/v2023-12-07)
 
 ### [core](https://github.com/OCR-D/core) [d8c5813](https://github.com/OCR-D/core/commits/d8c5813)..[742906e](https://github.com/OCR-D/core/commits/742906e)
@@ -209,8 +225,6 @@
   > * ocrd-page-transform: support --mets-server-url
 
 
-## Unreleased
-
 ## [v2023-10-18](https://github.com/OCR-D/ocrd_all/releases/v2023-10-18)
 
 ### [core](https://github.com/OCR-D/core) [3b0307a](https://github.com/OCR-D/core/commits/3b0307a)..[caa7ac3](https://github.com/OCR-D/core/commits/caa7ac3)
diff --git a/core b/core
index 742906e3..4684d48a 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 742906e330d5ef1139fd18c86b73c154c0a67eae
+Subproject commit 4684d48ac8c18b6f7a4473b5d6ffc6263ae3ab06