[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 705b1a: Fixup for missing glossary terms

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 705b1aebd659a0219b42dc203194221fac5c42a0
      https://github.com/phpmyadmin/phpmyadmin/commit/705b1aebd659a0219b42dc203194221fac5c42a0
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M doc/glossary.rst
    M doc/setup.rst

  Log Message:
  -----------
  Fixup for missing glossary terms

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: 370620a868b5cb373abb250a9e7453c567dd4664
      https://github.com/phpmyadmin/phpmyadmin/commit/370620a868b5cb373abb250a9e7453c567dd4664
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Changed paths:
    M doc/glossary.rst
    M doc/setup.rst

  Log Message:
  -----------
  Merge pull request #12127 from ibennetch/glossary

Fixup for missing glossary terms


  Commit: 42a852f6b33d58a67dbe95a68bd397fd1ffe1989
      https://github.com/phpmyadmin/phpmyadmin/commit/42a852f6b33d58a67dbe95a68bd397fd1ffe1989
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-25 (Fri, 25 Mar 2016)

  Changed paths:
    M doc/glossary.rst
    M doc/setup.rst

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57d769970ec2...42a852f6b33d