Merge branch 'develop' into bugfix/ui_build_on_windows

This commit is contained in:
Sebastian Sdorra
2020-03-18 21:45:53 +01:00
4 changed files with 3 additions and 3 deletions

View File

@@ -118,7 +118,7 @@ for more information.
- [i18n for Plugins](v2/i18n%20for%20Plugins.md "wikilink")
- [Extension Points](v2/Extension-Points.md "wikilink")
- [API changes](v2/API%20changes.md "wikilink")
- [ui-components/ui-types](v2/UI:%20Additions%20or%20Changes%20to%20ui-components%20or%20ui-types.md "wikilink")
- [ui-components/ui-types](v2/UI%20Additions%20or%20Changes%20to%20ui-components%20or%20ui-types.md "wikilink")
- [Vulnerabilities](v2/vulnerabilities.md "wikilink")
- [Common pitfall](v2/Common%20pitfall.md "wikilink")
- [Release process](v2/Release%20process.md "wikilink")

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

View File

@@ -196,7 +196,7 @@
<license>BSD 3-Clause</license>
<url>www.scm-manager.org</url>
<summary>${project.description}</summary>
<packager>Sebastian Sdorra &lt;s.sdorra@gmail.com&gt;</packager>
<packager>Sebastian Sdorra &lt;s.sdorra@gmail.com></packager>
<platform>
<architecture>noarch</architecture>
<os>linux</os>
@@ -306,7 +306,7 @@
</profiles>
<properties>
<commons.daemon.version>1.1.0</commons.daemon.version>
<commons.daemon.version>1.2.2</commons.daemon.version>
<commons.daemon.native.version>1.1.0</commons.daemon.native.version>
<exploded.directory>${project.build.directory}/appassembler/commons-daemon/scm-server</exploded.directory>
</properties>