Skip to content

V410#1

Merged
sicp618 merged 62 commits intomasterfrom
v410
Dec 23, 2016
Merged

V410#1
sicp618 merged 62 commits intomasterfrom
v410

Conversation

@sicp618
Copy link
Copy Markdown
Member

@sicp618 sicp618 commented Dec 15, 2016

No description provided.

sofakeer and others added 28 commits December 20, 2016 18:19
# Conflicts:
#	app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
#	app/src/main/res/values/styles.xml
Pull Request: 项目内外筛选
Created By: @阿朔
Accepted By: @陈超
URL: https://coding.net/u/coding/p/Coding-Android/git/pull/787
修复标签重复问题
Pull Request: 项目内外筛选
Created By: @阿朔
Accepted By: @陈超
URL: https://coding.net/u/coding/p/Coding-Android/git/pull/792
# Conflicts:
#	app/src/main/java/net/coding/program/project/detail/TaskListFragment.java
#	app/src/main/java/net/coding/program/task/TaskFragment.java
@sicp618 sicp618 merged commit 20fd117 into master Dec 23, 2016
sicp618 pushed a commit that referenced this pull request Feb 27, 2019
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.

5 participants