Merge branch 'master' into 'master'
authorChris Cormack <chris@bigballofwax.co.nz>
Fri, 14 Sep 2018 23:05:23 +0000 (23:05 +0000)
committerChris Cormack <chris@bigballofwax.co.nz>
Fri, 14 Sep 2018 23:05:23 +0000 (23:05 +0000)
commitd40854d4988fd5591d0bc84dbca2854e8ccee596
treee7a3d9058adc6e41a330f45038d857d234cfa2c0
parent52b5f505ae3c2a91657d4a2f2b79c451396f730d
parentba8d00c900a82e3941b8eccdb3478402123bd74e
Merge branch 'master' into 'master'

Bug #17390 - changed IntranetUserJS to OPACUserJS and modified the javascript

See merge request koha-community/koha-manual!157