Bugzilla – Attachment 88321 Details for
Bug 18308
Default value of minPasswordLength should be increased
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18308: (QA follow up) Resolving merge conflict
Bug-18308-QA-follow-up-Resolving-merge-conflict.patch (text/plain), 1.02 KB, created by
Liz Rea
on 2019-04-18 15:52:28 UTC
(
hide
)
Description:
Bug 18308: (QA follow up) Resolving merge conflict
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2019-04-18 15:52:28 UTC
Size:
1.02 KB
patch
obsolete
>From 75c4a5ceac34cd7891fe0cd79279962e168bf532 Mon Sep 17 00:00:00 2001 >From: Liz Rea <wizzyrea@gmail.com> >Date: Wed, 17 Apr 2019 07:03:31 +0000 >Subject: [PATCH] Bug 18308: (QA follow up) Resolving merge conflict > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt | 3 --- > 1 file changed, 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >index 6d22d8a937..a1ae8ac3b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -1,9 +1,6 @@ >-<<<<<<< HEAD > [% USE Koha %] > [% USE raw %] > [% USE Asset %] >-======= >->>>>>>> Bug 18308: Changed ordering of onboarding steps > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Web installer › Set minPasswordLength system preference</title> > [% INCLUDE 'installer-doc-head-close.inc' %] >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18308
:
68374
|
68381
|
68451
|
69318
|
69319
|
69320
|
69321
|
69323
|
69324
|
69459
|
69461
|
69462
|
87124
|
87125
|
87126
|
87128
|
87129
|
87339
|
87340
|
87564
|
87572
|
87573
|
87747
|
87959
|
87960
|
87961
|
87962
|
87963
|
87964
|
87966
|
88010
|
88011
|
88012
|
88013
|
88014
|
88242
|
88243
|
88306
|
88307
|
88308
|
88309
|
88310
|
88311
|
88312
|
88313
|
88314
|
88315
|
88316
|
88317
|
88318
|
88319
|
88320
|
88321
|
88840
|
90079
|
103617
|
104235
|
104236
|
104351