Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dff31f429d53906544ab9da27b43b45d2e8f309a https://github.com/phpmyadmin/phpmyadmin/commit/dff31f429d53906544ab9da27b43... Author: MatÃas Bellone matiasbellone+weblate@gmail.com Date: 2013-05-24 (Fri, 24 May 2013)
Changed paths: M po/es.po
Log Message: ----------- Translated using Weblate (Spanish)
Currently translated at 100.0% (2603 of 2603)
Commit: ebe2a318191706381dc4a03a8a612944786abfa2 https://github.com/phpmyadmin/phpmyadmin/commit/ebe2a318191706381dc4a03a8a61... Author: Marc Delisle marc@infomarc.info Date: 2013-05-24 (Fri, 24 May 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Commit: a984f06604d136ef0de460324c6e6f817cdc14d5 https://github.com/phpmyadmin/phpmyadmin/commit/a984f06604d136ef0de460324c6e... Author: Marc Delisle marc@infomarc.info Date: 2013-05-24 (Fri, 24 May 2013)
Log Message: ----------- Merge commit 'dff31f4'
Commit: 3c71a700ec119db4ca6614c9ebd2e43639adf958 https://github.com/phpmyadmin/phpmyadmin/commit/3c71a700ec119db4ca6614c9ebd2... Author: Marc Delisle marc@infomarc.info Date: 2013-05-24 (Fri, 24 May 2013)
Changed paths: M ChangeLog
Log Message: ----------- Merge branch 'QA_4_0'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ecd00dfac633...3c71a700ec11
-
Marc Delisle