Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
author Alex Sadleir
()
committer Alex Sadleir
()
commit 705c104275098df69bd347307eb2cbdea2541407
tree 379fd91548eacb85da5d90aabf8d5483a48c2fb6
parent 7f80f8f5af9799e05b7feb186730a9773fa0b944
parent 7ce2d4b5f69d98b7158cb7e5611a6701698f84ce
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr


Former-commit-id: b6c8a547ade7d55b43dbb7019988a3aeeef20537
34 files changed:
admin/genericAgencyFixer.php
admin/importRTKbodies.php
admin/refreshDesignDoc.php
couchdb/settee/src/classes/SetteeDatabase.class.php
couchdb/settee/src/classes/SetteeRestClient.class.php
css/bootstrap-responsive.css [ new file with mode 0644 ]
css/bootstrap-responsive.min.css [ new file with mode 0644 ]
css/bootstrap.css [ new file with mode 0644 ]
css/bootstrap.min.css [ new file with mode 0644 ]
documents/scrapers/0049d35216493c545ef5f7f000e6b252.py
documents/template.inc.php
getAgency.php
images/misc/button-gloss.png [ deleted file ]
images/misc/button-overlay.png [ deleted file ]
images/misc/custom-form-sprites.png [ deleted file ]
images/misc/input-bg.png [ deleted file ]
images/misc/modal-gloss.png [ deleted file ]
images/misc/table-sorter.png [ deleted file ]
images/orbit/bullets.jpg [ deleted file ]
images/orbit/left-arrow.png [ deleted file ]
images/orbit/loading.gif [ deleted file ]
images/orbit/mask-black.png [ deleted file ]
images/orbit/pause-black.png [ deleted file ]
images/orbit/right-arrow.png [ deleted file ]
images/orbit/rotator-black.png [ deleted file ]
images/orbit/timer-black.png [ deleted file ]
img/glyphicons-halflings-white.png [ new file with mode 0644 ]
img/glyphicons-halflings.png [ new file with mode 0644 ]
include/common.inc.php
include/template.inc.php
js/foundation.js [ deleted file ]
stylesheets/app.css [ deleted file ]
stylesheets/foundation.css [ deleted file ]
stylesheets/ie.css [ deleted file ]