Public Git Hosting - SMMID.git/commit

commit	6123019fc46df004696d3e3d89add2bbf34abe13
author	Lukas Mueller <lam87@cornell.edu>
	Tue, 6 Oct 2020 18:21:23 +0000 (6 14:21 -0400)
committer	Lukas Mueller <lam87@cornell.edu>
	Tue, 6 Oct 2020 18:21:23 +0000 (6 14:21 -0400)
tree	67ce0baf9b9449f796f7a6010de81560dc4ba946	tree \| snapshot (tar.gz zip)
parent	20ff444f9b47aa6c6315e774909346dcefb3413c	commit \| diff
parent	5e65b2ba23ef291b13a81557e272b91ceb220c48	commit \| diff

fix conflicts after merge.

Code and content behind smmid.org

lib/SMMID/Controller/REST/SMID.pm	diff1 \|	diff2 \|	blob \| history
lib/SMMID/Controller/SMID.pm	diff1 \|	diff2 \|	blob \| history
mason/smid/detail.mas	diff1 \|	diff2 \|	blob \| history
root/js/source/entries/smid_detail.js	diff1 \|	diff2 \|	blob \| history