lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-02-21 06:50:42 -08:00
commit d511d90a2f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.12', 'app_version' => 'v4.1.13',
'full_app_version' => 'v4.1.12 - build 3371-g4e39895', 'full_app_version' => 'v4.1.13 - build 3374-gcccd75f',
'build_version' => '3371', 'build_version' => '3374',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g4e39895', 'hash_version' => 'gcccd75f',
'full_hash' => 'v4.1.12-6-g4e39895', 'full_hash' => 'v4.1.12-7-gcccd75f',
'branch' => 'master', 'branch' => 'master',
); );

2
routes/web.php
View file

@ -124,7 +124,7 @@ Route::group(['middleware' => 'auth'], function () {
Route::group([ 'prefix' => 'admin','middleware' => ['authorize:superuser']], function () { Route::group([ 'prefix' => 'admin','middleware' => ['auth', 'authorize:superuser']], function () {
Route::get('settings', ['as' => 'settings.general.index','uses' => 'SettingsController@getSettings' ]); Route::get('settings', ['as' => 'settings.general.index','uses' => 'SettingsController@getSettings' ]);
Route::post('settings', ['as' => 'settings.general.save','uses' => 'SettingsController@postSettings' ]); Route::post('settings', ['as' => 'settings.general.save','uses' => 'SettingsController@postSettings' ]);