Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d31e966a43b31758cff708a068dded2d79e46118 https://github.com/phpmyadmin/phpmyadmin/commit/d31e966a43b31758cff708a068dd... Author: Marc Delisle marc@infomarc.info Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.1.1-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 971db6ef8b739ac290de5aaa6a5bcb81508d2541 https://github.com/phpmyadmin/phpmyadmin/commit/971db6ef8b739ac290de5aaa6a5b... Author: Marc Delisle marc@infomarc.info Date: 2013-12-08 (Sun, 08 Dec 2013)
Log Message: ----------- Merge commit 'd31e966'
Commit: 8d1be739b0053424ebd7563eb6bc7eb4aace6bba https://github.com/phpmyadmin/phpmyadmin/commit/8d1be739b0053424ebd7563eb6bc... Author: Marc Delisle marc@infomarc.info Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/227445371734...8d1be739b005
-
Marc Delisle