Update changelog and version numbers

timber · Sep 14, 2019 · a083701 · a083701
1 parent c920e6c
commit a083701
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/bin/timber.php b/bin/timber.php
@@ -4,7 +4,7 @@
 Description: The WordPress Timber Library allows you to write themes using the power of Twig templates.
 Plugin URI: http://timber.upstatement.com
 Author: Jared Novack + Upstatement
-Version: 1.10.1
+Version: 1.11.0
 Author URI: http://upstatement.com/
 */
 // we look for Composer files first in the plugins dir.

diff --git a/lib/Timber.php b/lib/Timber.php
@@ -35,7 +35,7 @@
  */
 class Timber {
 
-	public static $version = '1.10.1';
+	public static $version = '1.11.0';
 	public static $locations;
 	public static $dirname = 'views';
 	public static $twig_cache = false;

diff --git a/readme.txt b/readme.txt
@@ -1,9 +1,9 @@
 === Timber ===
-Contributors: jarednova, connorjburton, lggorman
+Contributors: jarednova
 Tags: template engine, templates, twig
 Requires at least: 4.7.12
-Tested up to: 5.2.1
-Stable tag: 1.10.1
+Tested up to: 5.2.3
+Stable tag: 1.11.0
 Requires PHP: 5.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -30,6 +30,10 @@ _Twig is the template language powering Timber; if you need a little background
 
 = Develop (next release) =
 
+= 1.11.0 =
+**General Note**
+- If you use WPML with Timber, please upgrade to WPML 4.2.8. The WPML team has removed their included Twig version which means no more conflicts!
+
 **Fixes and improvements**
 - Fix to menu items getting incorrect classes in WPML and others #1974
 - Fixed issue with Timber not respecting comment order #1731 #2015