Changeset - 1d880031fffb
Merge
0
13
0
Merge in my changes from today from those done in online wiki editing.
This merges branch 'master' of oak.sfconservancy.org:npo-acct
Resolving Conflicts:
ExistingProjects/EvaluationTemplate.mdwn
There didn't seem to be any real conflicts there, but auto-merger got confused.
This merges branch 'master' of oak.sfconservancy.org:npo-acct
Resolving Conflicts:
ExistingProjects/EvaluationTemplate.mdwn
There didn't seem to be any real conflicts there, but auto-merger got confused.
6 files changed with 14 insertions and 10 deletions:
0 comments (0 inline, 0 general)
0 comments (0 inline, 0 general)