Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d789ec68 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge remote-tracking branch 'upstream/2.0' into performance-improvements 



Signed-off-by: default avatarArnau Vàzquez Palma <arnauvp@e.email>

# Conflicts:
#	composer.json
#	index.php
#	src/Helpers/Build.php
parents c99c657c 3dae36a1

composer.json

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    {

      "type":"package",

      "package": {

        "name": "julianxhokaxhiu/DotNotation",

        "name": "julianxhokaxhiu/dotnotation",

        "version": "master",

        "source": {

          "url": "https://gist.github.com/a6098de64195f604f56a.git",
@@ -40,9 +40,9 @@ 
  ],

  "require": {

    "mikecao/flight": "1.*",

    "julianxhokaxhiu/DotNotation": "dev-master",

    "julianxhokaxhiu/dotnotation": "dev-master",

    "ext-zip": "*",

    "monolog/monolog": "1.23.*"

    "monolog/monolog": "2.0.*"

  },

  "autoload": {

    "psr-4": {