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.

white-yj8109 053d98bf6f Merge branch 'master' of https://bdgit.educoder.net/p6vxzahlf/Notes into wangyijia_branch ... # Conflicts: # src/notes/tool/DataUtils.java # src/notes/tool/TranslateUtils.java # src/notes/ui/BackgroundManager.java # src/notes/ui/CallRecordReceiver.java # src/notes/ui/CallRecordService.java # src/notes/ui/EncryptedFolderManager.java # src/notes/ui/ImageInsertHelper.java # src/notes/ui/MemoryBottleDialog.java # src/notes/ui/NoteEditActivity.java # src/notes/ui/NoteEditText.java # src/notes/ui/NotesListActivity.java # src/notes/ui/NotesListAdapter.java # src/notes/ui/NotesListItem.java # src/notes/ui/NotesPreferenceActivity.java # src/notes/ui/TrashManager.java # src/ui/NoteItemData.java		4 weeks ago
..
notes	Merge branch 'master' of https://bdgit.educoder.net/p6vxzahlf/Notes into wangyijia_branch	4 weeks ago
res	修复合并bug，上传res文件夹	4 weeks ago
ui	Merge branch 'master' of https://bdgit.educoder.net/p6vxzahlf/Notes into wangyijia_branch	4 weeks ago