-
- Downloads
Merge remote-tracking branch 'origin/develop'
Signed-off-by:
snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
Showing
- .all-contributorsrc 9 additions, 0 deletions.all-contributorsrc
- README.md 2 additions, 2 deletionsREADME.md
- app/Http/Controllers/Api/SettingsController.php 22 additions, 13 deletionsapp/Http/Controllers/Api/SettingsController.php
- app/Services/LdapAd.php 3 additions, 3 deletionsapp/Services/LdapAd.php
- composer.json 1 addition, 0 deletionscomposer.json
- composer.lock 700 additions, 386 deletionscomposer.lock
- config/app.php 0 additions, 3 deletionsconfig/app.php
- phpunit.xml 1 addition, 0 deletionsphpunit.xml
- resources/views/partials/forms/edit/image-upload.blade.php 1 addition, 1 deletionresources/views/partials/forms/edit/image-upload.blade.php
- resources/views/partials/forms/edit/uploadLogo.blade.php 1 addition, 1 deletionresources/views/partials/forms/edit/uploadLogo.blade.php
- resources/views/settings/branding.blade.php 1 addition, 1 deletionresources/views/settings/branding.blade.php
Loading
Please register or sign in to comment