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