Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a81ac373c82ec81351b3e5a30c5aa0b2b9e444af https://github.com/phpmyadmin/phpmyadmin/commit/a81ac373c82ec81351b3e5a30c5a... Author: Marc Delisle marc@infomarc.info Date: 2015-12-23 (Wed, 23 Dec 2015)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.5.3 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 5de5dc8463e5049541b1e03569e0f4563b2016db https://github.com/phpmyadmin/phpmyadmin/commit/5de5dc8463e5049541b1e03569e0... Author: Michal Čihař michal@cihar.com Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths: M libraries/tbl_common.inc.php
Log Message: ----------- Simplify detection of current script
Fixes #11754
Signed-off-by: Michal Čihař michal@cihar.com Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 63989d86660a89fd80f18c9f40ea2abf59ceb759 https://github.com/phpmyadmin/phpmyadmin/commit/63989d86660a89fd80f18c9f40ea... Author: Marc Delisle marc@infomarc.info Date: 2015-12-25 (Fri, 25 Dec 2015)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 09c3375ec29d9677515a60c0e6a60df1a1d3fdae https://github.com/phpmyadmin/phpmyadmin/commit/09c3375ec29d9677515a60c0e6a6... Author: Marc Delisle marc@infomarc.info Date: 2015-12-25 (Fri, 25 Dec 2015)
Log Message: ----------- Merge commit 'a81ac37' into QA_4_5
Commit: 4cd3597bdad38dcc6203018cc7dd3577829149d5 https://github.com/phpmyadmin/phpmyadmin/commit/4cd3597bdad38dcc6203018cc7dd... Author: Marc Delisle marc@infomarc.info Date: 2015-12-25 (Fri, 25 Dec 2015)
Changed paths: M ChangeLog M libraries/tbl_common.inc.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c9b35f480f3a...4cd3597bdad3
-
Marc Delisle