Merge branch 'master' of https://github.com/Adldap2/Adldap2-Laravel

stevebauman · stevebauman · commit 80641be49261 · 2018-01-30T09:59:16.000-05:00
diff --git a/src/Config/auth.php b/src/Config/auth.php
@@ -131,10 +131,10 @@
         | Eloquent
         |--------------------------------------------------------------------------
         |
-        | The value you enter is used for locating the local
-        | database record of the authenticating user.
+        | The value you enter is the database column name used for locating
+        | the local database record of the authenticating user.
         |
-        | If you're using a `username` field instead, change this to `username`.
+        | If you're using a `username` column instead, change this to `username`.
         |
         | This option is only applicable to the DatabaseUserProvider.
         |

Original file line number	Diff line number	Diff line change
`@@ -131,10 +131,10 @@`
`131`	`131`	`\| Eloquent`
`132`	`132`	`\|--------------------------------------------------------------------------`
`133`	`133`	`\|`
`134`		`- \| The value you enter is used for locating the local`
`135`		`- \| database record of the authenticating user.`
	`134`	`+ \| The value you enter is the database column name used for locating`
	`135`	`+ \| the local database record of the authenticating user.`
`136`	`136`	`\|`
`137`		- \| If you're using a `username` field instead, change this to `username`.
	`137`	+ \| If you're using a `username` column instead, change this to `username`.
`138`	`138`	`\|`
`139`	`139`	`\| This option is only applicable to the DatabaseUserProvider.`
`140`	`140`	`\|`