Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cd249f1cbe4e4baaaa21bba70eb919b71b9468b0
      
https://github.com/phpmyadmin/phpmyadmin/commit/cd249f1cbe4e4baaaa21bba70eb919b71b9468b0
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M ChangeLog
    M prefs_manage.php

  Log Message:
  -----------
  rfe #1572 User prefs: Diff-friendly JSON for config

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: f6a19c79cbb802fc8d8fa86fd4e7d26b59749afa
      
https://github.com/phpmyadmin/phpmyadmin/commit/f6a19c79cbb802fc8d8fa86fd4e7d26b59749afa
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php
    M po/sk.po
    M po/ta.po
    M po/th.po
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/315503c2b290...f6a19c79cbb8
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to