houxg c577dc2670 Merge branch 'develop' into feature/support_tag ...

# Conflicts:
#	app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java

2016-11-29 16:12:25 +08:00

..

src

Merge branch 'develop' into feature/support_tag

2016-11-29 16:12:25 +08:00

.gitignore

first build

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

build.gradle

Fix time parse error, that ExceptionInInitializerError

2016-11-27 13:14:03 +08:00

production.properties

integrate Flurry

2016-11-21 18:02:20 +08:00

proguard-rules.pro

first build

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

staging.properties

integrate Flurry

2016-11-21 18:02:20 +08:00