Merge pull request #202 from Automattic/release/3.6.0

Release 3.6.0

Author: renatho

readme.txt

@@ -45,6 +45,8 @@ Try excluding this plugin's Javascript from any performance optimizations your s
 * New: Add ```language shortcut. #180
 * New: Add block alignment support. #179
 * New: Add language selector to block toolbar. #172
+* Fix: transform issue. #201
+* Fix: toolbar code selection for latest Gutenberg versions #200
 * Fix: Content attribute selector. #178
 * Fix: Escaping for shortcodes and URLs. #177
 * Fix: Escaping issues with HTML entities. #160

syntaxhighlighter.php

@@ -4,7 +4,7 @@
 
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   https://alex.blog/wordpress-plugins/syntaxhighlighter/
-Version:      3.6.0-beta.2
+Version:      3.6.0
 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/
@@ -19,7 +19,7 @@
 
 class SyntaxHighlighter {
 	// All of these variables are private. Filters are provided for things that can be modified.
-	var $pluginver            = '3.6.0-beta.2';  // Plugin version
+	var $pluginver            = '3.6.0';  // Plugin version
 	var $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
 	var $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
 	var $settings             = array();  // Contains the user's settings