Merge branch 'master' into works-with-ruby-2-5

pry · May 22, 2020 · efb7855 · efb7855
2 parents b831162 + 7058ed2
commit efb7855
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,5 +4,5 @@
 * Fix Pry#_pry_ => #pry_instance deprecation
 
 ## v0.4.11 (21 May 2020)
-* Fix broken `show-stack` in Pry 0.13+
-* Fix Binding.source_location deprecations
+* Special branch for Ruby 2.5
+* Fix Pry 0.13+ deprecations and broken `show-stack`
diff --git a/README.md b/README.md
@@ -3,7 +3,9 @@ pry-stack_explorer
 
 _Walk the stack in a Pry session_
 
-Note: **Requires Ruby 2.6+ as of version 0.5.0.**
+Ruby versions: **Branch v0.5 requires Ruby 2.6+**. Branch v0.4.11+ will remain for Ruby 2.5 users until its EOL in March 2021.
+
+---
 
 pry-stack_explorer is a plugin for the [Pry](http://pry.github.com)
 REPL that enables the user to navigate the call-stack.
@@ -69,8 +71,8 @@ Output from above is `Goodbye` as we changed the `x` local inside the `alpha` (c
 Compatible versions
 -------------------
 * v0.5: Ruby 2.6+, Pry 0.13+
-* v0.4.10: Ruby 2.6+, Pry 0.12+
-* v0.4.9.3: Ruby 2.5 and older
+* v0.4.11: Ruby 2.5, Pry 0.12+ (branch `works-with-ruby-2-5`)
+* v0.4.9.3: Older versions
 
 
 License