Merge branch 'user/khuckins/lp1939994-course-details-archive-workaround' into course...

author Kyle Huckins <khuckins@catalyte.io>

Tue, 22 Mar 2022 21:02:37 +0000 (21:02 +0000)

committer Kyle Huckins <khuckins@catalyte.io>

Tue, 22 Mar 2022 21:02:37 +0000 (21:02 +0000)
author Kyle Huckins <khuckins@catalyte.io>
Tue, 22 Mar 2022 21:02:37 +0000 (21:02 +0000)
committer Kyle Huckins <khuckins@catalyte.io>
Tue, 22 Mar 2022 21:02:37 +0000 (21:02 +0000)
diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
Simple merge
diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
Simple merge
diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
Simple merge
author	Kyle Huckins <khuckins@catalyte.io>
	Tue, 22 Mar 2022 21:02:37 +0000 (21:02 +0000)
committer	Kyle Huckins <khuckins@catalyte.io>
	Tue, 22 Mar 2022 21:02:37 +0000 (21:02 +0000)
		1	2
Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html	patch \|	diff1 \|	diff2 \|	blob \| history