git merge bs
authorIvan Kohler <ivan@freeside.biz>
Mon, 27 Nov 2017 20:18:37 +0000 (12:18 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 27 Nov 2017 20:18:37 +0000 (12:18 -0800)
commitb278990fcae28c2f2c09a66ed8f388ac0fa478f8
treea4159b96974b4ff55b7757678030666557a099ad
parentd2e3299a0af2b5122d73b9f3ca0814a36919b1da
git merge bs
httemplate/search/elements/search.html