Jonathan Druart
49ab11b61d
Fix bad conflict resolution with bug 29648. Test plan: Confirm that the "Columns" button is displayed on the patron result view and that it works as expected. Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> |
||
|---|---|---|
| .. | ||
| accountline-details.tt | ||
| apikeys.tt | ||
| boraccount.tt | ||
| deletemem.tt | ||
| discharge.tt | ||
| discharges.tt | ||
| files.tt | ||
| holdshistory.tt | ||
| housebound.tt | ||
| ill-requests.tt | ||
| mancredit.tt | ||
| maninvoice.tt | ||
| member-flags.tt | ||
| member-password.tt | ||
| member.tt | ||
| memberentrygen.tt | ||
| members-update.tt | ||
| merge-patrons.tt | ||
| moremember-brief.tt | ||
| moremember-print.tt | ||
| moremember.tt | ||
| notices.tt | ||
| pay.tt | ||
| paycollect.tt | ||
| printfeercpt.tt | ||
| printinvoice.tt | ||
| purchase-suggestions.tt | ||
| readingrec.tt | ||
| recallshistory.tt | ||
| routing-lists.tt | ||
| search.tt | ||
| statistics.tt | ||
| two_factor_auth.tt | ||
| update-child.tt | ||