zt515 814a05088d Merge branch 'master' of git.oschina.net:lody/neoterm ...

# Conflicts:
#	app/src/main/res/values/strings.xml

2017-06-12 17:53:57 +08:00

..

android/support/v7/app

UI: Setting Activity.

2017-06-12 17:30:13 +08:00

io/neoterm

Merge branch 'master' of git.oschina.net:lody/neoterm

2017-06-12 17:53:57 +08:00