Skylar Ittner 64ae4358fe Merge https://source.netsyms.com/Business/BusinessAppTemplate ...

# Conflicts:
#	lang/en_us.php
#	static/js/app.js

2018-06-01 14:09:57 -06:00

..

en_us.php

Merge https://source.netsyms.com/Business/BusinessAppTemplate

2018-06-01 14:09:57 -06:00

messages.php

Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font

2018-04-13 01:53:16 -06:00