Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a1f69b4c808eeb49d336ff01e6d966200d062a56 https://github.com/phpmyadmin/phpmyadmin/commit/a1f69b4c808eeb49d336ff01e6d9... Author: Michal Čihař michal@cihar.com Date: 2016-06-16 (Thu, 16 Jun 2016)

Changed paths: M gis_data_editor.php

Log Message: ----------- Fix syntax error

Signed-off-by: Michal Čihař michal@cihar.com

Commit: e1301418163c08434b517c92729629d5bb1e1733 https://github.com/phpmyadmin/phpmyadmin/commit/e1301418163c08434b517c927296... Author: Michal Čihař michal@cihar.com Date: 2016-06-16 (Thu, 16 Jun 2016)

Changed paths: M gis_data_editor.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8170e7fcbc33...e1301418163c