altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity
datatracker/ietf/templates/ipr
History
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
..
.gitignore Merged from log:branch/2.00@2363: Current release branch head to trunk. 2010-07-21 12:48:05 +00:00
details.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
details.txt Port all still relevant changes between trunk before migration and charter branch to new trunk (mostly various minor template fixes), except 0.24 version of draft.py tool which has some interfaces changes that requires changes in the submit tool 2012-04-30 13:36:56 +00:00
details_edit.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
disclosure.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
list.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
list_item.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
new_update_email.txt use correct URL in new IPR notification email 2013-12-09 20:13:37 +00:00
removed.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_doc_list.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_doc_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_doctitle_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_error.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_holder_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_iprtitle_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_patent_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
search_wg_result.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
submitted.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00
update.html Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 2014-10-14 11:48:57 +00:00