Merge pull request #226 from Automattic/release/3.6.1

Release 3.6.1

Author: merkushin

composer.lock

@@ -1,6 +1,6 @@
 {
   "name": "syntaxhighlighter",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Easily post syntax-highlighted code to your WordPress site without having to modify the code at all.",
   "homepage": "https://alex.blog/wordpress-plugins/syntaxhighlighter/",
   "author": "Alex Mills (Viper007Bond)",

package-lock.json

@@ -2,9 +2,9 @@
 Contributors: Viper007Bond, automattic, donncha
 Donate link: https://alex.blog/2019/03/13/in-memory-of-alex-donation-link-update/
 Tags: code, source, sourcecode, php, syntax highlighting, syntax, highlight, highlighting, highlighter, WordPress.com
-Requires at least: 5.2
-Tested up to: 5.7
-Stable tag: 3.6.0
+Requires at least: 5.6
+Tested up to: 5.8
+Stable tag: 3.6.1
 
 Easily post syntax-highlighted code to your site without having to modify the code at all. As seen on WordPress.com.
 
@@ -40,6 +40,15 @@ Try excluding this plugin's Javascript from any performance optimizations your s
 
 == ChangeLog ==
 
+= Version 3.6.1 =
+
+* New: Set code block language when pasting into editor. #215
+* New: Add syntax highlight for Haskell. #210
+* New: Display the list of available brushes. #221
+* Fix: Line alignment for bootstrap themes. #222
+* Fix: Add space around code. #223
+* Fix: XML brush - use the last occurrence of the tag. #225
+
 = Version 3.6.0 =
 
 * New: Add ```language shortcut. #180

package.json

@@ -4,22 +4,22 @@
 
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   https://alex.blog/wordpress-plugins/syntaxhighlighter/
-Version:      3.6.0
+Version:      3.6.1
 Description:  Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a>. Includes a new editor block.
 Author:       Alex Mills (Viper007Bond)
 Author URI:   https://alex.blog/
 Text Domain:  syntaxhighlighter
 License:      GPL2
 License URI:  https://www.gnu.org/licenses/gpl-2.0.html
-Requires at least: 5.2
-Tested up to: 5.7
+Requires at least: 5.6
+Tested up to: 5.8
 Requires PHP: 7.0
 
 **************************************************************************/
 
 class SyntaxHighlighter {
 	// All of these variables are private. Filters are provided for things that can be modified.
-	public $pluginver            = '3.6.0';  // Plugin version
+	public $pluginver            = '3.6.1';  // Plugin version
 	public $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
 	public $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
 	public $settings             = array();  // Contains the user's settings