Merge branch 'master' into pdfreader

Browse source

- fix merge conflicts master -> pdfreader

...

This commit is contained in:

frankdelange 2018-01-18 01:26:39 +01:00

parent da416425ef 3143b469da

commit 41d5a19252

8 changed files with 22 additions and 3 deletions

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

BIN

dist/files_reader-1.0.1.tar.gz vendored Normal file

View file

Binary file not shown.

BIN

dist/files_reader-1.0.2.tar.gz vendored Normal file

View file

Binary file not shown.

BIN

dist/files_reader-1.0.3.tar.gz vendored Normal file

View file

Binary file not shown.

BIN

dist/files_reader-1.0.4.tar.gz vendored Normal file

View file

Binary file not shown.