datatracker/ietf/templates/sync
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
..
discrepancies.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
discrepancies_report.txt Add POST interface for IANA/RFC Editor for triggering updates, add 2012-09-17 15:57:48 +00:00
notify.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
rfceditor_undo.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00