Lars Eggert a4daf2630c Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift ... Conflicts: ietf/doc/templatetags/ietf_filters.py ietf/doc/views_charter.py ietf/templates/doc/charter/edit_notify.html ietf/templates/doc/charter/edit_telechat_date.html ietf/templates/doc/document_ballot_content.html ietf/templates/doc/document_history.html ietf/templates/doc/edit_notify.html ietf/templates/doc/edit_telechat_date.html ietf/templates/doc/notify.html ietf/templates/group/concluded_groups.html - Legacy-Id: 8429		2014-10-14 11:48:57 +00:00
..
css	Merged in [8262] and [8263] from rjsparks@nostrum.com:	2014-09-28 19:57:01 +00:00
dev	Added a dev-specific robots.txt, which blocks all robots.	2013-09-18 17:44:51 +00:00
doc	Put doc files under static.	2010-10-26 13:08:34 +00:00
facelift	Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift	2014-10-14 11:48:57 +00:00
images	Javascript and image file for "untrack document" feature.	2014-07-19 19:45:37 +00:00
js	Removes a modify-while-iterating error, and removes a bug where two different bits of code thought they were responsible for deleting things from a global list. Fixes bug #1498. Commit ready for merge.	2014-10-06 21:40:54 +00:00
secretariat	fix various issues with recent changes	2014-04-01 18:09:11 +00:00
test	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
.gitignore	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
robots.txt	We want to disallow all robot access to development servers, but for the production server we want indexing from search engines. Fix robots.txt accordingly.	2012-03-07 10:18:12 +00:00