Merge branch 'master' of https://bdgit.educoder.net/mwxbgi697/cantonbro

Browse Source

# Conflicts:
#	src/ui/AlarmAlertActivity.java
#	src/ui/AlarmInitReceiver.java
#	src/ui/AlarmReceiver.java
#	src/ui/DateTimePicker.java
#	src/ui/DateTimePickerDialog.java
#	src/ui/DropdownMenu.java
#	src/ui/FoldersListAdapter.java

master

张林浩 2 years ago

parent 5d5610134d e37f61a483

commit 55a8205188

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available