Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dc05a0e2a97f33b55787835f2ea26e90e0c5b04a
      
https://github.com/phpmyadmin/phpmyadmin/commit/dc05a0e2a97f33b55787835f2ea26e90e0c5b04a
  Author: Kristjan R├Ąts <kristjanr...@gmail.com>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]


  Commit: e1081d143195b2b4cf04450beccf5cc1fda29e1c
      
https://github.com/phpmyadmin/phpmyadmin/commit/e1081d143195b2b4cf04450beccf5cc1fda29e1c
  Author: Weblate <nore...@weblate.org>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5


  Commit: fcc89aa203bbbeb0586ba7bec4cd8ae436cdd1bf
      
https://github.com/phpmyadmin/phpmyadmin/commit/fcc89aa203bbbeb0586ba7bec4cd8ae436cdd1bf
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M libraries/Table.class.php
    M test/classes/PMA_Table_test.php

  Log Message:
  -----------
  Fix - exclude db name in SQL when relations are made between table in the 
same db
To prevent replication from breaking when replicating to a db with different 
name

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


  Commit: d33af6a721220abfb7d825a0d9120a1020863cdd
      
https://github.com/phpmyadmin/phpmyadmin/commit/d33af6a721220abfb7d825a0d9120a1020863cdd
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5


  Commit: 36ddd9c67033b81d762e94c5c704d95ddc1a5eea
      
https://github.com/phpmyadmin/phpmyadmin/commit/36ddd9c67033b81d762e94c5c704d95ddc1a5eea
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M libraries/Table.php
    M test/classes/TableTest.php

  Log Message:
  -----------
  Merge branch 'QA_4_5'

Conflicts:
        libraries/Table.php


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/50325e58e8bc...36ddd9c67033
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to