Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ba50cbb91cdd6b9f06f2386b4ff5b1a46c0d644d https://github.com/phpmyadmin/phpmyadmin/commit/ba50cbb91cdd6b9f06f2386b4ff5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-10-10 (Mon, 10 Oct 2016)

Changed paths: M libraries/DisplayResults.php M libraries/Table.php

Log Message: ----------- Fix bug #12234 No page indicator in view

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 088d2c36f63a32b318caffd33e240b4d7496127f https://github.com/phpmyadmin/phpmyadmin/commit/088d2c36f63a32b318caffd33e24... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-10-12 (Wed, 12 Oct 2016)

Changed paths: M libraries/DisplayResults.php

Log Message: ----------- Fix string concatenation

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: e0923d54e2fa95b3f706c7b7d1f20320dda11607 https://github.com/phpmyadmin/phpmyadmin/commit/e0923d54e2fa95b3f706c7b7d1f2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-10-12 (Wed, 12 Oct 2016)

Changed paths: M README.rst M libraries/replication.inc.php M po/ckb.po M po/da.po M po/ia.po M po/id.po M po/pt.po M po/ro.po M po/ta.po M po/vi.po M server_replication.php

Log Message: ----------- Merge branch 'QA_4_6' into bug12234

Commit: 2c91327374674061f43fd0b2feb335c251d8a9fc https://github.com/phpmyadmin/phpmyadmin/commit/2c91327374674061f43fd0b2feb3... Author: Michal Čihař michal@cihar.com Date: 2016-10-25 (Tue, 25 Oct 2016)

Changed paths: M libraries/DisplayResults.php M libraries/Table.php

Log Message: ----------- Merge pull request #12626 from madhuracj/bug12234

Fix bug #12234 No page indicator in view

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0983ff058663...2c9132737467