[doris-website] 03/03: Merge branch 'master' of https://github.com/apache/doris-website

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiafengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git

commit 6b8e0b3eda716b8a0897230d6c5fa2506398fdf4
Merge: a96e723bee fed70282cc
Author: jiafeng.zhang <zh...@gmail.com>
AuthorDate: Thu Jul 21 16:17:53 2022 +0800

    Merge branch 'master' of https://github.com/apache/doris-website
    
    # Conflicts:
    #       .gitignore

 .gitignore                    |  29 +++++++++++++++++++++++------
 src/pages/download/index.scss |   6 +++++-
 static/images/icon/u21.png    | Bin 20333 -> 5981 bytes
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --cc .gitignore
index 11aa77384a,c1d977f9ed..ead04b614e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,23 +1,24 @@@
- community/.DS_Store
- docs/admin-manual/.DS_Store
+ # Dependencies
+ /node_modules
+ 
+ # Production
+ /build
+ 
+ # Generated files
  .docusaurus
- build
- docs/advanced/.DS_Store
- .github/.DS_Store
- node_modules
+ .cache-loader
+ 
+ # Misc
+ .DS_Store
+ .env.local
+ .env.development.local
+ .env.test.local
+ .env.production.local
+ package-lock.json
+ 
+ npm-debug.log*
+ yarn-debug.log*
+ yarn-error.log*
+ 
 -*.zip
++*.zip
++*.zip


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org