Merge pull request #315 from pyouroboros/develop

v1.4.1 Merge
pyouroboros · Jun 4, 2019 · 405f778 · 405f778
2 parents c8c8777 + 64a8762
commit 405f778
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 5 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://buymeacoff.ee/ouroboros
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,19 @@
 # Change Log
 
-## [1.4.0](https://github.com/pyouroboros/ouroboros/tree/1.4.0) (2019-04-24)
-[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.3.1...1.4.0)
+## [1.4.1](https://github.com/pyouroboros/ouroboros/tree/1.4.1) (2019-06-03)
+[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/v1.4.0...1.4.1)
+
+**Closed issues:**
+
+- Slack won't work [\#313](https://github.com/pyouroboros/ouroboros/issues/313)
+
+**Other Pull Requests**
+
+- v1.4.1 Merge [\#315](https://github.com/pyouroboros/ouroboros/pull/315) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
+- v1.4.1 to develop [\#314](https://github.com/pyouroboros/ouroboros/pull/314) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
+
+## [v1.4.0](https://github.com/pyouroboros/ouroboros/tree/v1.4.0) (2019-04-25)
+[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.3.1...v1.4.0)
 
 **Implemented enhancements:**
 
@@ -23,8 +35,9 @@
 **Other Pull Requests**
 
 - v1.4.0 Merge [\#299](https://github.com/pyouroboros/ouroboros/pull/299) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
-- Remove Watchtower Reference [\#299](https://github.com/pyouroboros/ouroboros/pull/299) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
+- Remove Watchtower Reference [\#298](https://github.com/pyouroboros/ouroboros/pull/298) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
 - v1.4.0 to develop [\#297](https://github.com/pyouroboros/ouroboros/pull/297) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
+- fixes \#284 [\#296](https://github.com/pyouroboros/ouroboros/pull/296) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
 - Patches [\#295](https://github.com/pyouroboros/ouroboros/pull/295) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
 - Fix healthcheck attr [\#294](https://github.com/pyouroboros/ouroboros/pull/294) ([circa10a](https://github.com/circa10a))
 - Patch/catch up [\#271](https://github.com/pyouroboros/ouroboros/pull/271) ([DirtyCajunRice](https://github.com/DirtyCajunRice))

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img width="800" src="https://bin.cajun.pro/images/ouroboros/ouroboros_logo_primary_long_cropped.jpg">
+<img width="800" src="https://raw.githubusercontent.com/pyouroboros/ouroboros/master/assets/ouroboros_logo_primary_long_cropped.jpg" alt="Ouroboros Logo">
 
 [![Discord](https://img.shields.io/discord/532695326117593112.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/qHNByUW)
 [![BuyUsCoffee](https://img.shields.io/badge/BuyMeACoffee-Donate-ff813f.svg?logo=CoffeeScript&style=flat-square)](https://buymeacoff.ee/ouroboros)  

diff --git a/assets/ouroboros_logo_primary.png b/assets/ouroboros_logo_primary.png
diff --git a/assets/ouroboros_logo_primary_cropped.jpg b/assets/ouroboros_logo_primary_cropped.jpg
diff --git a/assets/ouroboros_logo_primary_cropped.png b/assets/ouroboros_logo_primary_cropped.png
diff --git a/assets/ouroboros_logo_primary_discord.jpg b/assets/ouroboros_logo_primary_discord.jpg
diff --git a/assets/ouroboros_logo_primary_long_cropped.jpg b/assets/ouroboros_logo_primary_long_cropped.jpg
diff --git a/assets/ouroboros_logo_primary_smaller_square_crop.png b/assets/ouroboros_logo_primary_smaller_square_crop.png
diff --git a/pyouroboros/__init__.py b/pyouroboros/__init__.py
@@ -1,2 +1,2 @@
-VERSION = "1.4.0"
+VERSION = "1.4.1"
 BRANCH = "master"