Bug 16520 (Follow up) Rebase fixes
authorNick Clemens <nick@bywatersolutions.com>
Thu, 13 Oct 2016 08:35:24 +0000 (08:35 +0000)
committerKyle M Hall <kyle@bywatersolutions.com>
Tue, 11 Oct 2016 12:37:17 +0000 (12:37 +0000)
commit174769e382dfd5205595a5b9ae7b58c8ebf5d850
treed271e2c4c4c5dad77796a580efea310bfc5870b4
parente40f61bc3087727db75d07b02c34545300d153b1
Bug 16520 (Follow up) Rebase fixes

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
C4/Context.pm
Koha/Middleware/SetEnv.pm