Dan Pearl's branch needs a rebase on master. There are conflicts in Open-ILS/src/templates/opac/css/style.css.tt2 and Open-ILS/src/templates/opac/parts/misc_util.tt2. While I was confident that I can resolve the first one, I'm not as confident on the second.
I am going to remove the pullrequest tag until such time as Dan or someone rebases the branch and addresses Pasi's i18n concerns above.
Dan Pearl's branch needs a rebase on master. There are conflicts in Open-ILS/ src/templates/ opac/css/ style.css. tt2 and Open-ILS/ src/templates/ opac/parts/ misc_util. tt2. While I was confident that I can resolve the first one, I'm not as confident on the second.
I am going to remove the pullrequest tag until such time as Dan or someone rebases the branch and addresses Pasi's i18n concerns above.