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> |
||
|---|---|---|
| .. | ||
| acqui | ||
| admin | ||
| authorities | ||
| basket | ||
| batch | ||
| catalogue | ||
| cataloguing | ||
| circ | ||
| clubs | ||
| course_reserves | ||
| errors | ||
| ill | ||
| installer | ||
| labels | ||
| mana | ||
| members | ||
| offline_circ | ||
| onboarding | ||
| patron_lists | ||
| patroncards | ||
| plugins | ||
| pos | ||
| recalls | ||
| reports | ||
| reserve | ||
| reviews | ||
| rotating_collections | ||
| serials | ||
| services | ||
| suggestion | ||
| tags | ||
| test | ||
| tools | ||
| virtualshelves | ||
| about.tt | ||
| auth.tt | ||
| intranet-main.tt | ||