Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
author Maxious
()
committer Maxious
()
commit 32943557937f5d2e89edb02ef1767762412fc6f6
tree 6f6a587cc9db2a49175143a8376f490d0bb9a192
parent 835cba9e5eae8d1d8768b5cb52bb5c24dfbda04d
parent 84926113fcfba4afb937196a0176e870b3be2307
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr


Former-commit-id: 4734f5390c1e31ca41d2ae836d07ccbe262876e8
19 files changed:
about.php
admin/logo.ai [ new file with mode 0644 ]
admin/logo.svg [ new file with mode 0644 ]
documents/agency.php
documents/charts.php
documents/genericScrapers.py
documents/template.inc.php
employees-fail.php [ moved from charts.php with 99%% similarity ]
getAgency.php
include/common.inc.php
include/couchdb.inc.php
include/template.inc.php
lib/FeedWriter/FeedTypes.php [ deleted file ]
lib/FeedWriter/README
lib/FeedWriter/examples/example_atom.php
lib/FeedWriter/examples/example_minimum.php
lib/FeedWriter/examples/example_rss1.php
lib/FeedWriter/examples/example_rss2.php
ranking.php [ new file with mode 0644 ]