houxg 6c7926d8ed Merge branch 'upstream/develop' into develop ...

# Conflicts:
#	app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
#	app/src/main/java/org/houxg/leamonax/ui/Navigation.java
#	app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
#	app/src/main/res/values-zh/strings.xml
#	app/src/main/res/values/strings.xml

2017-03-09 15:19:00 +08:00

..

src

Merge branch 'upstream/develop' into develop

2017-03-09 15:19:00 +08:00

.gitignore

first build

2016-11-19 18:09:30 +08:00

build.gradle

use betterspinner

2017-03-01 19:18:57 +08:00

proguard-rules.pro

integrate ugly

2016-12-16 19:25:55 +08:00