Merge branch 'master' of github.com:shadowsocks/shadowsocks-android
This commit is contained in:
@@ -6,7 +6,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
|
||||
|
||||
### CI STATUS
|
||||
|
||||
[](https://travis-ci.org/shadowsocks/shadowsocks-android)
|
||||
[](https://travis-ci.org/shadowsocks/shadowsocks-android)
|
||||
|
||||
### PREREQUISITES
|
||||
|
||||
@@ -65,7 +65,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
|
||||
|
||||
### 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>>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
Reference in New Issue
Block a user