-
http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web into v532 # Conflicts: # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
-
# Conflicts: # src/main/java/com/cnlive/mz/live/rest/BaseUtil.java
-
http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web.git into v532 Conflicts: src/main/webapp/pages/live/video_management.jsp src/main/webapp/pages/live/video_view.jsp target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
-
checkaction See merge request !11
-
baseUtil ok See merge request !10
-
添加直播管理 See merge request !9
-
ck ok See merge request !8
-
添加直播回放act See merge request !7
-
check See merge request !6
-
添加直播接口 See merge request !5
-
jsp See merge request !4
-
ugc项目迁移 See merge request !3
-
1
-
video See merge request !2