[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 889cd3: Prevent leaving an orphaned file while importing p...

2016-10-12 Thread Deven Bansod 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  
https://github.com/phpmyadmin/phpmyadmin/commit/889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Prevent leaving an orphaned file while importing preferences

Fix #12362

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 889cd3: Prevent leaving an orphaned file while importing p...

2016-10-12 Thread Deven Bansod 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  
https://github.com/phpmyadmin/phpmyadmin/commit/889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Prevent leaving an orphaned file while importing preferences

Fix #12362

Signed-off-by: Deven Bansod 


  Commit: f6d2804aba1d1dbbb0dd8cfac031bc16f30bc936
  
https://github.com/phpmyadmin/phpmyadmin/commit/f6d2804aba1d1dbbb0dd8cfac031bc16f30bc936
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/262eb1acf728...f6d2804aba1d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git