Commit 02737bbf authored by Max Lv's avatar Max Lv

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

parents 4d907bbd 6018346d
...@@ -6,7 +6,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ...@@ -6,7 +6,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
### CI STATUS ### CI STATUS
[![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-android.svg)](https://travis-ci.org/shadowsocks/shadowsocks-android) [![Build Status](https://api.travis-ci.org/shadowsocks/shadowsocks-android.svg)](https://travis-ci.org/shadowsocks/shadowsocks-android)
### PREREQUISITES ### PREREQUISITES
...@@ -65,7 +65,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ...@@ -65,7 +65,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
### LICENSE ### LICENSE
Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>> Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>> <br/>
Copyright (C) 2016 by Mygod Studio <<mygodstudio@gmail.com>> Copyright (C) 2016 by Mygod Studio <<mygodstudio@gmail.com>>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment