Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
author Maxious
()
committer Maxious
()
commit 04edae81cf1e23d3d77d0c2fd4292e5e03a573fd
tree f4357f8cc30736cbc7966a9d5d70c07399a28c46
parent 29ff266d09edba92b2e51ee98a7b3035428553e5
parent ffb630b58b78314af4fbd440790d54c627731304
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr

Conflicts:
documents/rss.xml.php
lib/FeedWriter

Former-commit-id: 9f314c20fca6d7ffb1eaa4892e7b316bc0ea3628
admin/refreshDesignDoc.php
documents/about.php [ new file with mode 0644 ]
documents/genericScrapers.py
documents/rss.xml.php
documents/scrapers/227cb6eb7d2c9f8a6e846df7447d6caa.py
documents/template.inc.php