projects
/
contrib
/
Conifer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c6e0cae
a865c96
)
Merge remote-tracking branch 'upstream/master'
author
Yamil Suarez
<github@yamil.com>
Wed, 19 Oct 2011 15:42:42 +0000
(11:42 -0400)
committer
Yamil Suarez
<github@yamil.com>
Wed, 19 Oct 2011 15:42:42 +0000
(11:42 -0400)
Conflicts:
1.6/admin/Upgrading-Evergreen_1.6.xml
1.6/admin/serversideinstallation.xml
2.0/admin/Upgrading-Evergreen-2.0.xml
2.0/admin/serversideinstallation_2.0.xml
Trivial merge
projects / contrib / Conifer.git / commitdiff