Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
I can pull.
|
|
(3.1-3.2)
|
|
|
|
|
|
|
|
|
|
Conflicts:
docs/DesignDocument.md
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
to work I'll add it to the other one.
|
|
|
|
|
|
|
|
Conflicts:
docs/DesignDocument.docx
docs/DesignDocument.md
|
|
|
|
|
|
Conflicts:
docs/DesignDocument.docx
|
|
|
|
first sloppy work. Luke and Andrew, I have no clue what the model section should be.
|