Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: a172e530d7ece7d6c97906d9d09e352d820f2877 https://github.com/phpmyadmin/website/commit/a172e530d7ece7d6c97906d9d09e352... Author: Michal Čihař <michal@cihar.com> Date: 2014-04-09 (Wed, 09 Apr 2014) Changed paths: M templates/team.tpl Log Message: ----------- Mention my new role Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 9677f2341005b2152c0ccc54ac66e2bba7da2b17 https://github.com/phpmyadmin/website/commit/9677f2341005b2152c0ccc54ac66e2b... Author: Michal Čihař <michal@cihar.com> Date: 2014-05-08 (Thu, 08 May 2014) Changed paths: M data/menu.py R images/vds64_200x68.png M templates/_littleboxes.tpl M templates/security/PMASA-2004-4 M templates/security/PMASA-2013-1 M templates/sponsors.tpl M templates/team.tpl Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/website Conflicts: templates/team.tpl Commit: 251b95919f00576ef6511c2f1542645c2343ea2a https://github.com/phpmyadmin/website/commit/251b95919f00576ef6511c2f1542645... Author: Michal Čihař <michal@cihar.com> Date: 2014-05-08 (Thu, 08 May 2014) Changed paths: M render.py Log Message: ----------- List 4.2 version as well Signed-off-by: Michal Čihař <michal@cihar.com> Commit: fce4fb3feb9d5082e578c0b4200ddcc0c4a344c3 https://github.com/phpmyadmin/website/commit/fce4fb3feb9d5082e578c0b4200ddcc... Author: Michal Čihař <michal@cihar.com> Date: 2014-05-08 (Thu, 08 May 2014) Changed paths: M templates/team.tpl Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/website Compare: https://github.com/phpmyadmin/website/compare/f2cd4706b9de...fce4fb3feb9d