tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse source
This commit is contained in:
Hillel Coren 2018-03-29 17:06:36 +03:00
commit 38475db379
2 changed files with 470 additions and 453 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

921
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
resources/views/header.blade.php
View file

@ -392,7 +392,7 @@
@endif
@endforeach
@if ( ! Utils::isNinjaProd())
@foreach (Module::all() as $module)
@foreach (Module::collections() as $module)
@include('partials.navigation_option', [
'option' => $module->getAlias(),
'icon' => $module->get('icon', 'th-large'),