Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

# Conflicts: # CHANGELOG.md
getgrav · Dec 15, 2017 · e9b7c8d · e9b7c8d
2 parents b6e5bfa + fb106b1
commit e9b7c8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
     * Added `theme_var` and `body_class` Twig functions that are useful for themes
 1. [](#improved)
     * Updated vendor libraries to latest version
+    * Removed constructor from ObjectInterface
 1. [](#bugfix)
     * Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
 
@@ -26,6 +27,8 @@
 # v1.3.11
 ## mm/dd/2017
 
+1. [](#improved)
+    * Updated vendor libraries to latest
 1. [](#bugfix)
     * Fixed issue with _illegal scheme offset_ in `Uri::convertUrl()` [page-inject#8](https://github.com/getgrav/grav-plugin-page-inject/issues/8)
 

diff --git a/system/src/Grav/Framework/Object/Interfaces/ObjectInterface.php b/system/src/Grav/Framework/Object/Interfaces/ObjectInterface.php
@@ -14,12 +14,6 @@
  */
 interface ObjectInterface extends \Serializable, \JsonSerializable
 {
-    /**
-     * @param array $elements
-     * @param string $key
-     */
-    public function __construct(array $elements = [], $key = null);
-
     /**
      * @return string
      */