Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate
# Conflicts:
# .gitignore
# README.md
# action.php
# api.php
# app.php
# composer.json
# composer.lock
# index.php
# lang/en_us.php
# lang/messages.php
# lib/iputils.php
# lib/login.php
# lib/userinfo.php
# mobile/index.php
# nbproject/project.properties
# nbproject/project.xml
# pages.php
# pages/404.php
# pages/home.php
# required.php
# settings.template.php
# static/css/app.css
# static/img/logo.png
# static/img/logo.svg
# static/js/app.js
|
Skylar Ittner