Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

添加视频选择页面内的录像功能 #9

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

添加视频选择页面内的录像功能 #9

wants to merge 7 commits into from

Conversation

pye52
Copy link

@pye52 pye52 commented Feb 9, 2017

rt

kanade added 7 commits February 7, 2017 17:03
# Conflicts:
#	boxing/src/main/java/com/bilibili/boxing/model/task/impl/VideoTask.java
# Conflicts:
#	boxing-impl/src/main/java/com/bilibili/boxing_impl/ui/BoxingBottomSheetFragment.java
#	boxing/src/main/java/com/bilibili/boxing/AbsBoxingViewFragment.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant