houxg 12c327da62 Merge branch 'develop' into feature/import_html ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/houxg/leamonax/ui/AboutActivity.java
#	app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java
#	app/src/main/res/menu/preview.xml

2016-12-19 15:45:17 +08:00

..

src

Merge branch 'develop' into feature/import_html

2016-12-19 15:45:17 +08:00

.gitignore

first build

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

build.gradle

Merge branch 'develop' into feature/import_html

2016-12-19 15:45:17 +08:00

production.properties

integrate ugly

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

proguard-rules.pro

integrate ugly

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

staging.properties

integrate ugly

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