Merge remote-tracking branch 'origin/issue-35' into issue-35

Browse Source

# Conflicts:
#	app/src/main/res/layout/item_reader.xml

...

This commit is contained in:

Pupil

2020-01-22 23:22:44 +09:00

parent a39484b6ea 9ea55664b6

commit 37123a2cd5

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available