Closed DolphinDTM closed 8 years ago
can you please pull from here and sort out the merge conflict?
Idk why there are conficts when I updated my app.py to be latest (then made changes) though I guess it wants to merge the whole thing which could cause conflicts. Bother me in private when I'm available.
Also renamed the form fields.