You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

SheYu e01e666ae8 Merge branch 'develop' of https://bdgit.educoder.net/m6wf5oeyl/MiNotes into wushuxian_branch ... # Conflicts: # .gitignore # .idea/.gitignore # doc/小米便签的代码标注.docx # src/main/AndroidManifest.xml # src/main/java/net/micode/notes/data/Contact.java # src/main/java/net/micode/notes/data/Notes.java # src/main/java/net/micode/notes/data/NotesDatabaseHelper.java # src/main/java/net/micode/notes/data/NotesProvider.java # src/main/java/net/micode/notes/ui/AlarmAlertActivity.java # src/main/res/drawable-hdpi/edit_red.9.png		11 months ago
..
MiNotes.iml	解决冲突	11 months ago
modules.xml	解决冲突	11 months ago
vcs.xml	解决冲突	11 months ago