NPO-Accounting/npo-accounting-ikiwiki Files · ExistingProjects/GNUEnterprise.mdwn

Files @ 1d880031fffb

Branch filter:

Location: NPO-Accounting/npo-accounting-ikiwiki/ExistingProjects/GNUEnterprise.mdwn

1d880031fffb 226 B text/plain Show Annotation Show as Raw Download as Raw

bkuhn

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.

Links

- [[!wikipedia GNU_Enterprise]] - Wikipedia
- <http://www.gnuenterprise.org> - Project homepage

<http://www.gnuenterprise.org> and <http://gnuenterprise.org> has been unreachable on 2013-10-22, 2013-10-23, 2013-10-24.