From: Dan Scott Date: Sun, 7 Dec 2014 12:25:01 +0000 (-0500) Subject: Merge remote-tracking branch 'remotes/conifer/feature/tpac_hide_awards_2_7' into... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=011a805cc5a1e368286cd3b2cd75fa6dc6cb6a85;p=contrib%2FConifer.git Merge remote-tracking branch 'remotes/conifer/feature/tpac_hide_awards_2_7' into mergery_2_7 --- 011a805cc5a1e368286cd3b2cd75fa6dc6cb6a85