Merge remote-tracking branch 'origin/1.x'

ao-apps · Sep 18, 2023 · 95a5ebf · 95a5ebf
2 parents 26ec731 + fc43982
commit 95a5ebf
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/pom.xml b/book/pom.xml
@@ -36,6 +36,7 @@ along with semanticcms-file.  If not, see <https://www.gnu.org/licenses/>.
     <!-- Must be set to ${git.commit.time} for snapshots or ISO 8601 timestamp for releases. -->
     <project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp>
     <module.name>com.semanticcms.file.book</module.name>
+    <subproject.subpath>devel/</subproject.subpath>
     <!-- These values are copied from the project being documented -->
     <documented.artifactId>semanticcms-file</documented.artifactId>
     <documented.name>SemanticCMS File</documented.name>

diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view