Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

broadcast_cloud / web-live

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 2
  • Pipelines
  • Wiki
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !175 opened May 28, 2021 by 王含泽@wanghanze 
  • Report abuse
Report abuse

Publisher 自动合并请求 [2wSMk-D2tOdKt_F4hjZ8P]

Merge branch 'master' into dev


Merge branch 'dev' of gitlab.aodianyun.com:broadcast_cloud/web-live into dev


Merge branch 'dev' of gitlab.aodianyun.com:broadcast_cloud/web-live into dev


feat

  1. 支持微信分享纳入邀请

fix

  1. 修复微信分享配置初始化与登录不匹配的问题

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b dev origin/dev

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff dev

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 5
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陈英杰 @chenyingjie

    Status changed to merged

    May 28, 2021

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • 陈英杰 @chenyingjie

    mentioned in commit 4a512103

    May 28, 2021

    mentioned in commit 4a512103

    mentioned in commit 4a512103f6cb8cc70aea7570b5deb90e6e7d296d
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: broadcast_cloud/web-live!175
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.