Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7e3309fc2a6ff073b7fcb97cfb699277ad819c51 https://github.com/phpmyadmin/phpmyadmin/commit/7e3309fc2a6ff073b7fcb97cfb69... Author: Isaac Bennetch bennetch@gmail.com Date: 2015-01-05 (Mon, 05 Jan 2015)

Changed paths: M doc/config.rst M doc/setup.rst

Log Message: ----------- User documentation for Zero Configuration

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: c6bf4d61bc69699b5d535038f7270c0f41b10213 https://github.com/phpmyadmin/phpmyadmin/commit/c6bf4d61bc69699b5d535038f727... Author: Marc Delisle marc@infomarc.info Date: 2015-01-05 (Mon, 05 Jan 2015)

Changed paths: M doc/setup.rst

Log Message: ----------- Clarifications

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 0f3e58bf2e64e0ddd5ecf9b4d85937421d27f24a https://github.com/phpmyadmin/phpmyadmin/commit/0f3e58bf2e64e0ddd5ecf9b4d859... Author: Marc Delisle marc@infomarc.info Date: 2015-01-05 (Mon, 05 Jan 2015)

Changed paths: M doc/config.rst M doc/setup.rst

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/495250f8cb39...0f3e58bf2e64