|
|
f1f682780c
|
Merge BusinessAppTemplate
# Conflicts:
# .gitignore
# README.md
# action.php
# api.php
# app.php
# composer.json
# composer.lock
# index.php
# langs/en/core.json
# langs/en/titles.json
# langs/messages.php
# lib/Exceptions.lib.php
# lib/Login.lib.php
# lib/Notifications.lib.php
# lib/Strings.lib.php
# lib/User.lib.php
# mobile/index.php
# nbproject/project.properties
# nbproject/project.xml
# pages.php
# pages/home.php
# required.php
# settings.template.php
# static/css/bootstrap.min.css
# static/img/logo.svg
# static/js/app.js
|
2018-12-02 13:51:27 -07:00 |
|
