diff options
| author | olpc user <olpc@xo-5d-f7-86.localdomain> | 2020-01-04 17:33:24 -0800 |
|---|---|---|
| committer | olpc user <olpc@xo-5d-f7-86.localdomain> | 2020-01-04 17:33:24 -0800 |
| commit | 1811a937d704bf058d46ae1c78e30e2e3af10dc7 (patch) | |
| tree | 17c25254e258666602a0d4ef612d8dd537b84e6e /dialogue.txt | |
| parent | f8048cb88952b443d66265f3d790db00215f2907 (diff) | |
| parent | 05bd2ed5a01e99ccec8012b548a7a5634db4ec17 (diff) | |
| download | standingwithresilience-1811a937d704bf058d46ae1c78e30e2e3af10dc7.tar.gz standingwithresilience-1811a937d704bf058d46ae1c78e30e2e3af10dc7.zip | |
wasn't expecting merge, guess I didn't push something ... remembering
now. merging for a reason.
Merge branch 'master' of xloem.github:xloem/intellect
Diffstat (limited to 'dialogue.txt')
0 files changed, 0 insertions, 0 deletions