Merge remote-tracking branch 'origin/master'

# Conflicts:
#	doc/小米便签泛读、标注和维护报告文档.docx
#	src/main/AndroidManifest.xml
#	src/main/java/net/micode/notes/ui/NoteEditActivity.java
master
SheYu 11 months ago
commit c2a6fb6447
Loading…
Cancel
Save