Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 752083f4d811a92878796adcc7ca33ab94a8658b
https://github.com/phpmyadmin/phpmyadmin/commit/752083f4d811a92878796adcc7ca33ab94a8658b
Author: Marc Delisle <[email protected]>
Date: 2013-01-19 (Sat, 19 Jan 2013)
Changed paths:
M ChangeLog
M libraries/Config.class.php
M libraries/auth/cookie.auth.lib.php
Log Message:
-----------
bug #3776 [cookies] Login without auth on second server
Commit: 88c27ed19fc9730c86f6799dd5b59bd26978ec54
https://github.com/phpmyadmin/phpmyadmin/commit/88c27ed19fc9730c86f6799dd5b59bd26978ec54
Author: Marc Delisle <[email protected]>
Date: 2013-01-19 (Sat, 19 Jan 2013)
Log Message:
-----------
Merge branch 'QA_3_5'
Commit: ebb89e8521e437d017ec6211677d639dc035b693
https://github.com/phpmyadmin/phpmyadmin/commit/ebb89e8521e437d017ec6211677d639dc035b693
Author: Marc Delisle <[email protected]>
Date: 2013-01-19 (Sat, 19 Jan 2013)
Changed paths:
M ChangeLog
M libraries/Config.class.php
Log Message:
-----------
Fix merge conflicts
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/ee0be2ec16d8...ebb89e8521e4
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
