cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-21 13:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

Browse Source 
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
This commit is contained in:
Jack Goh
2018-06-13 14:43:30 +08:00
parent bdb6ebcb2f dac3e600db
commit 90fcbcda73
10 changed files with 26058 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/ResetPasswordController.php
+6
View File
@@ -44,6 +44,12 @@ class ResetPasswordController extends Controller
}
protected function showResetForm(){
<<<<<<< HEAD
return view('index');
}
=======
return view('index');
}
>>>>>>> dac3e600db54490eae91cffe68b2a7c72b00df87
}