Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 385b04c86fc27fc2043e9f7af8bcb0faae9ff3d0 https://github.com/phpmyadmin/phpmyadmin/commit/385b04c86fc27fc2043e9f7af8bc... Author: Michal Čihař michal@cihar.com Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths: M po/id.po
Log Message: ----------- Translated using Weblate (Indonesian)
Currently translated at 74.8% (1947 of 2603)
Commit: a0d0ab9ecb01b0b3b97220133bff2393370f9409 https://github.com/phpmyadmin/phpmyadmin/commit/a0d0ab9ecb01b0b3b97220133bff... Author: Peter Rosa peter.rosa@pro.sk Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths: M po/sk.po
Log Message: ----------- Translated using Weblate (Slovak)
Currently translated at 83.7% (2180 of 2603)
Commit: 99222656ee5fbf321683014cb79cdb6e2a4cd765 https://github.com/phpmyadmin/phpmyadmin/commit/99222656ee5fbf321683014cb79c... Author: Weblate noreply@weblate.org Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths: M ChangeLog M sql.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 80dec52d987f7e9d8b59bbcc6e307cf48fd6a3e3 https://github.com/phpmyadmin/phpmyadmin/commit/80dec52d987f7e9d8b59bbcc6e30... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php M server_privileges.php
Log Message: ----------- Fix bug#3922, user privileges, in QA_4_0
Commit: 5778f641b32d126ac4c363c2962764e63d5eae23 https://github.com/phpmyadmin/phpmyadmin/commit/5778f641b32d126ac4c363c29627... Author: Marc Delisle marc@infomarc.info Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths: M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.4-rc1
Commit: 821a1373d7238f69018bec3d426ba5a73f159945 https://github.com/phpmyadmin/phpmyadmin/commit/821a1373d7238f69018bec3d426b... Author: Marc Delisle marc@infomarc.info Date: 2013-06-13 (Thu, 13 Jun 2013)
Log Message: ----------- Merge branch 'MAINT_4_0_4' into QA_4_0
Commit: 18b7f4e4d0deb26092c38e938728f98372ada4c4 https://github.com/phpmyadmin/phpmyadmin/commit/18b7f4e4d0deb26092c38e938728... Author: Marc Delisle marc@infomarc.info Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.5-dev
Commit: b59a884e8b410e7063d9c5edf611f44027a5998f https://github.com/phpmyadmin/phpmyadmin/commit/b59a884e8b410e7063d9c5edf611... Author: Marc Delisle marc@infomarc.info Date: 2013-06-13 (Thu, 13 Jun 2013)
Log Message: ----------- Merge branch 'QA_4_0'
Commit: 14bfb4cead96d33f18d9385ec1145ea8d13e057f https://github.com/phpmyadmin/phpmyadmin/commit/14bfb4cead96d33f18d9385ec114... Author: Marc Delisle marc@infomarc.info Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eddeb82fb670...14bfb4cead96
-
Marc Delisle