Commit 292bf500 authored by wanglei's avatar wanglei

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentFragment.kt
#	app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/PdfDialog.kt
parents ad0675a6 e4b64c7b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment