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 for 1.1.1 #19

Merged
merged 32 commits into from Apr 25, 2017

Conversation

Projects
None yet
2 participants
@michaelachmann
Copy link
Owner

commented Apr 25, 2017

Additions for 1.1.1 have been made in working-branch and are ready to be released

michaelachmann and others added some commits Mar 23, 2017

Merge branch 'working-branch' of github.com:michaelachmann/LnkShorten…
…er into working-branch

Merge Changes from Laptop and PC
Added Chinese translation / 添加中文翻译
Added Chinese translation / 添加中文翻译
Merge pull request #18 from eallion/working-branch
Added Chinese translation / 添加中文翻译
Merge branch 'working-branch' of github.com:michaelachmann/LnkShorten…
…er into working-branch

Merge remote and local (Chinese translation via Merge in remote)

@michaelachmann michaelachmann added this to the v 1.1.1 milestone Apr 25, 2017

@michaelachmann michaelachmann merged commit e419b2f into master Apr 25, 2017

@michaelachmann michaelachmann deleted the working-branch branch Apr 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.