Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: phpmyadmin/phpmyadmin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: startxfr/phpmyadmin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 23, 2017

  1. If no config.inc.php file is found in CONFIG_FILE, try to find one in… 

    … directory ./conf/. Useful for mount this directory and get config file available in several container environement or use case (s2i build)
    @startxfr
    startxfr committed Jul 23, 2017
    Configuration menu
    Copy the full SHA
    d808f02 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from phpmyadmin/master 

    get upstream change into master
    @startxfr
    startxfr authored Jul 23, 2017
    Configuration menu
    Copy the full SHA
    733dbb2 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. Merge pull request #2 from phpmyadmin/master 

    update startxfr fork
    @startxfr
    startxfr authored Mar 8, 2018
    Configuration menu
    Copy the full SHA
    5097465 View commit details
    Browse the repository at this point in the history
Loading