git merge bs
authorIvan Kohler <ivan@freeside.biz>
Mon, 27 Nov 2017 20:17:49 +0000 (12:17 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 27 Nov 2017 20:17:49 +0000 (12:17 -0800)
commitd2e3299a0af2b5122d73b9f3ca0814a36919b1da
treeaf4a19c955baa9726e703334c951623e076e73a5
parentf2dca165c20e75f7a6048d048f353b56d9f2d621
parent95144265eeb3ecd13b16708dbdd75dd3701f92ad
git merge bs
FS/FS/Record.pm
httemplate/search/elements/search.html