[RELEASE] Release of version 1.2.6 (Resolves #52 and related to #53)

jonathanheilmann · Jan 15, 2017 · 0629753 · 0629753
1 parent a41ea4f
commit 0629753
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
@@ -22,6 +22,14 @@ ChangeLog
    :Changes:
          Changes
 
+ - :Version:
+         1.2.6
+
+   :Changes:
+        \* [FOLLOWUP][BUGFIX]   #48 #52   Error after installation
+
+        \* [BUGFIX]         #53     Change composer.json typo3/cms requirement to OR instead of AND
+
  - :Version:
          1.2.5
 

diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -29,7 +29,7 @@ Open Graph protocol
 		Open Graph protocol, social network, facebook
 
 	:Copyright:
-		2012-2016
+		2012-2017
 
 	:Author:
 		Jonathan Heilmann

diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml
@@ -8,10 +8,10 @@
 
 ---
 conf.py:
-  copyright: 2012-2016
+  copyright: 2012-2017
   project: Open Graph protocol
   version: 1.2
-  release: 1.2.3
+  release: 1.2.6
   intersphinx_mapping:
     t3tsref:
     - http://docs.typo3.org/typo3cms/TyposcriptReference/

diff --git a/composer.json b/composer.json
@@ -7,9 +7,9 @@
   "support": {
     "issues": "https://github.com/jonathanheilmann/ext-jh_opengraphprotocol/issues"
   },
-  "version": "1.2.5",
+  "version": "1.2.6",
   "require": {
-    "typo3/cms": "~6.2,~7.6"
+    "typo3/cms": "~6.2||~7.6"
   },
   "replace": {
     "jh_opengraphprotocol": "self.version",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -15,7 +15,7 @@
     'description' => 'Adds the Open Graph protocol properties in meta-tags to the html-header supporting multilingual-websites.',
     'category' => 'plugin',
     'shy' => 0,
-    'version' => '1.2.5',
+    'version' => '1.2.6',
     'dependencies' => '',
     'conflicts' => '',
     'priority' => '',