Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
author Alex Sadleir
()
committer Alex Sadleir
()
commit 5948d2a9216855b7a214dd4f5fcb82ed6af548d3
tree e3b1aadfbd4e0325ddb958e9af6ed2e3d82ca943
parent c64b3fe20debb60737f29c859d2bcf41ef0f70a7
parent 1663d0ccb9b095f3af73323b107867a0de161730
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr

Conflicts:
documents/genericScrapers.py
documents/runScrapers.sh

Former-commit-id: a6f8697ed080934b51ab7b63a3d4428ff5ccdb2b
14 files changed:
documents/genericScrapers.py
documents/runScrapers.sh
documents/scrape.py
documents/scrapers/0049d35216493c545ef5f7f000e6b252.py
documents/scrapers/227cb6eb7d2c9f8a6e846df7447d6caa.py
documents/scrapers/24bd71114d3975ed9a63ad29624c62c9.py
documents/scrapers/3d5871a44abbbc81ef5b3a420070755d.py
documents/scrapers/6fa04af95fbe7de96daa2c7560e0aad3.py
documents/scrapers/7c6adc1d41cf029bf1a0959e5156477a.py
documents/scrapers/8e874a2fde8aa0ccdc6d14573d766540.py
documents/scrapers/a687a9eaab9e10e9e118d3fd7cf0e13a.py
documents/scrapers/b0ca7fddcd1c965787daea47f2d32e0a.py [ new file with mode 0644 ]
documents/scrapers/dfd7414bb0c21a0076ab559901ae0588.py
documents/scrapers/f2ab2908d8ee56ed8d995ef4187e75e6.py