Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
author Maxious
()
committer Maxious
()
commit f5007cb041c9b48f6948dc6591180e1fcc84ce51
tree 0d757b97f4137e9d1c6b1715a1fdc29fc41dacea
parent 7029a647661841d063a1b866f916e4bec2ba7096
parent 33152ec49ae33d83419fcebedbe0a413678dff55
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr

Conflicts:
documents/sitemap.xml.php

Former-commit-id: 0480844aebe20a3af30b1c98aa192a5a823fb4d6
admin/logo.svg
admin/refreshDesignDoc.php
documents/robots.txt
documents/sitemap.xml.php
exportAgencies.csv.php [ new file with mode 0644 ]
getAgency.php
include/template.inc.php
robots.txt
schemas/agency.json.php
sitemap.xml.php