Merge branch 'master' of https://bdgit.educoder.net/p9zsfw5q4/x
# Conflicts: # src/micode/app/src/main/AndroidManifest.xml # src/micode/app/src/main/java/net/micode/notes/model/Note.java # src/micode/documnet/小米便签开源代码的泛读报告.pdf # src/micode/小米便签开源代码的泛读报告.pdfmaster
commit
8aa1d7bac5