Merge branch 'develop' into feature/PTDL-472

This commit is contained in:
Dane Everitt 2017-06-25 15:36:39 -05:00
commit b7b046c044
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 672 additions and 82 deletions

View file

@ -75,5 +75,5 @@ Route::group(['prefix' => 'account/security'], function () {
Route::post('/totp', 'SecurityController@setTotp');
Route::delete('/api/security/totp', 'SecurityController@disableTotp');
Route::delete('/totp', 'SecurityController@disableTotp');
});