[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f40760: Ignore some development files when exporting Git

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f407601d5988f97b47ff53e5bace9e17463b8f50 https://github.com/phpmyadmin/phpmyadmin/commit/f407601d5988f97b47ff53e5bac… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: A .gitattributes Log Message: ----------- Ignore some development files when exporting Git Fixes #13632 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f6364e45ab30122cee64bb6c0b1ab253a336f09c https://github.com/phpmyadmin/phpmyadmin/commit/f6364e45ab30122cee64bb6c0b1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: A .gitattributes Log Message: ----------- Merge branch 'QA_4_7' Commit: f4b0faf6982ee4a6295dc7bf6b2b9690e43f2809 https://github.com/phpmyadmin/phpmyadmin/commit/f4b0faf6982ee4a6295dc7bf6b2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Ensure we use correct name for internal relations Fixes #13638 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b030ce4e311fd6ec251ffbe81c8dbb2a4fbd6175 https://github.com/phpmyadmin/phpmyadmin/commit/b030ce4e311fd6ec251ffbe81c8… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M po/lv.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: 3163ad31813321f10f6925c6b9070b043a7ef6e1 https://github.com/phpmyadmin/phpmyadmin/commit/3163ad31813321f10f6925c6b90… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M libraries/classes/DisplayResults.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/17821c2bcbe8...3163ad318133