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

Files @ 1d880031fffb

Branch filter:

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

1d880031fffb 199 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:

- <https://erpnext.com> - Commercial homepage
- <https://erpnext.com/open-source> - Community homepage
- <https://github.com/webnotes/erpnext> - Source code

Demo: <https://demo.erpnext.com>