Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
NeoRazorX committed Jun 10, 2017
2 parents bf05b2f + c97c943 commit fc3865d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@
"twbs/bootstrap": "dev-master",
"components/font-awesome": "dev-master",
"maximebf/debugbar": "dev-master"
},
"autoload": {
"psr-4": {
"FacturaScripts\\Base\\": "base/"
}
}
}
7 changes: 2 additions & 5 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

require_once __DIR__ . '/vendor/autoload.php';
require_once __DIR__ . '/base/fs_plugin_manager.php';
require_once __DIR__ . '/base/fs_i18n.php';
require_once __DIR__ . '/base/fs_controller.php';

use FacturaScripts\Base\fs_i18n;
use FacturaScripts\Base\fs_plugin_manager;
Expand Down Expand Up @@ -108,4 +105,4 @@
$response = new Response($twig->render('template_not_found.html', $templateVars), Response::HTTP_INTERNAL_SERVER_ERROR);
}
$response->send();
}
}

0 comments on commit fc3865d

Please sign in to comment.