[incubator-streampipes-website] branch master updated (fb7e20fb -> 97290e19)

[ze...@apache.org]

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

zehnder pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-website.git


    from fb7e20fb Merge branch 'dev'
     add 3b43d6aa Add  member: Florian Micklich
     new 97290e19 Merge pull request #33 from apache/dev

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 website/img/about/micklich.png | Bin 0 -> 374294 bytes
 website/team.ejs               |  19 +++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 website/img/about/micklich.png

[incubator-streampipes-website] 01/01: Merge pull request #33 from apache/dev

[ze...@apache.org]

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

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

commit 97290e19bc3d243d17eee8b3a178a4e3845477d0
Merge: fb7e20fb 3b43d6aa
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Fri Nov 11 14:28:25 2022 +0100

    Merge pull request #33 from apache/dev
    
    Dev

 website/img/about/micklich.png | Bin 0 -> 374294 bytes
 website/team.ejs               |  19 +++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)