projects
/
contrib
/
Conifer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5745d9c
14ec006
)
Merge remote-tracking branch 'remotes/conifer/feature/tpac_hide_awards_2_7' into...
author
Dan Scott
<dscott@laurentian.ca>
Sun, 7 Dec 2014 12:25:01 +0000
(07:25 -0500)
committer
Dan Scott
<dscott@laurentian.ca>
Sun, 7 Dec 2014 12:25:01 +0000
(07:25 -0500)
Trivial merge