Merge branch 'QA_4_3'

phpmyadmin · Nov 20, 2014 · 2eb927d · 2eb927d
2 parents 76a441c + 89515a0
commit 2eb927d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -67,6 +67,8 @@ phpMyAdmin - ChangeLog
 - bug #4391 Upgraded to 4.2.0, insanely slow now
 + rfe #1537 PHP OpenSSL support for cookie encryption/decryption
 
+4.2.13.0 (not yet released)
+
 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled
 - bug #4577 Multi row actions cause full page reloads