Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-14 16:47:25 +02:00
commit 12bf2f9dc6

View File

@ -1808,7 +1808,6 @@ div.sqlvalidate {
.result_query div.sqlOuter {
background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
padding: 1em;
}
#PMA_slidingMessage code.sql,
@ -3534,4 +3533,4 @@ body .ui-dialog .ui-dialog-title {
body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: <?php echo $right; ?>;
}
/* end of styles for jQuery-ui to support rtl languages */
/* end of styles for jQuery-ui to support rtl languages */