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

merge trunk #1

Merged
merged 2 commits into from Jul 28, 2015
Merged

merge trunk #1

merged 2 commits into from Jul 28, 2015

Conversation

MaGonglei
Copy link
Owner

No description provided.

deploy.sh脚本兼容MAC环境,以及.gitignore增加.idea配置
MaGonglei added a commit that referenced this pull request Jul 28, 2015
@MaGonglei MaGonglei merged commit bee7f06 into MaGonglei:master Jul 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants