You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2025/01/09 06:25:34 UTC
(linkis-website) 01/01: Merge remote-tracking branch 'upstream/dev' into asf-staging
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/linkis-website.git
commit 3baf70652e0bafaff21e44ce6c9240ac235b98c4
Merge: 4c29df77563 bdb21bae820
Author: peacewong <pe...@apache.org>
AuthorDate: Thu Jan 9 14:24:52 2025 +0800
Merge remote-tracking branch 'upstream/dev' into asf-staging
# Conflicts:
# info.txt
# static/Images/wedatasphere_contact_01.png
info.txt | 91 ++++++++++++++++++++++++++++++
static/Images/wedatasphere_contact_01.png | Bin 0 -> 399213 bytes
2 files changed, 91 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org