Merge branch 'dev' into view_details

This commit is contained in:
Veronica K. B. Olsen
2020-05-28 19:34:22 +02:00
41 changed files with 358 additions and 242 deletions
+7
View File
@@ -0,0 +1,7 @@
%%~ ae7339df26ded:e7ded148d6e4a:7031beac91f75:We Found John!
### We Found John!
@pov: John
@location: Mars, OuterSpace
Jane has been searching for a while, and she finally found John on Mars. He was indeed in space! What was he doing on Mars anyway? Well, it turns out, he was farming potatoes.