2 Jul
2012
2 Jul
'12
2:28 p.m.
Hi Atul and Thilina,
please watch for the recent changes that were merged to upstream master regarding the new PMA_CommonFunctions class.
You'll have to be extra careful with the code that exists only in your repo, when merging upstream master into your repo. Have a look at [0] to see what needs to be done to solve the conflicts.
[0] https://github.com/phpmyadmin/phpmyadmin/commit/2d055c8190117cf962f6c43d4010...
--
Marc Delisle
http://infomarc.info