| commit | 2bfe60538489a8167ae1f687c705920c4d19aec2 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Wed, 12 Aug 2015 19:41:16 +0000 (12 15:41 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Wed, 12 Aug 2015 19:41:16 +0000 (12 15:41 -0400) | ||
| tree | fd139fb3d2a5ad54ca698f47ec3ede508aca9eb6 | treesnapshot (tar.gz zip) |
| parent | 6e23dcfc26ea04b14a6a93b72a67ae9c8f0ea55e | commitdiff |
| parent | 7c63935d721af8985f9b3eb7921707f26e0d2cb2 | commitdiff |
Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
Signed-off-by: Marc Delisle <marc@infomarc.info>
| ChangeLog | diff1 | diff2 | blobhistory |
| libraries/plugins/auth/AuthenticationCookie.class.php | diff1 | diff2 | blobhistory |