Merge branch 'master' into illuminatiparrot

jmhobbs · Oct 23, 2019 · 6fef519 · 6fef519
2 parents 37d1f8d + bf16aca
commit 6fef519
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/parrots.json b/parrots.json
@@ -698,6 +698,11 @@
       "name": "Bob Ross Parrot",
       "tip": "Happy trees, happy life!"
     },
+    {
+      "hd": "hd/yosemitesamparrot.gif",
+      "name": "Yosemite Sam Parrot",
+      "tip": "Now I got you Rabbit!"
+    },
     {
       "gif": "illuminatiparrot.gif",
       "hd": "hd/illuminatiparrot.gif",

diff --git a/parrots/hd/yosemitesamparrot.gif b/parrots/hd/yosemitesamparrot.gif