[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a01546: Fix wrong merge in composer.json

19 Apr 2016

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a0154623b5f2c49dd79d300eb4954a0c179fe7e3
     
https://github.com/phpmyadmin/phpmyadmin/commit/a0154623b5f2c49dd79d300eb49…
  Author: Michal Čihař &lt;michal(a)cihar.com&gt;
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M composer.json

  Log Message:
  -----------
  Fix wrong merge in composer.json

Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt;

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a01546: Fix wrong merge in composer.json