Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 9876aeb550766e7774460a2e4e65bef619d07261
https://github.com/phpmyadmin/phpmyadmin/commit/9876aeb550766e7774460a2e4e6…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
Log Message:
-----------
Finish removing the gather suboption of the error handler
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: b2305dcefc4191f0c23e1b315f369f2605c09d85
https://github.com/phpmyadmin/phpmyadmin/commit/b2305dcefc4191f0c23e1b315f3…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
Log Message:
-----------
Fix merge conflicts
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/680e5497240c...b2305dcefc41