[Phpmyadmin-git] [phpmyadmin/website] 3e814d: End of support for 4.2.x

Branch: refs/heads/django Home: https://github.com/phpmyadmin/website Commit: 3e814d3bbc63c6993013e0fc213902a8270877ad https://github.com/phpmyadmin/website/commit/3e814d3bbc63c6993013e0fc213902… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-01 (Wed, 01 Jul 2015) Changed paths: M render.py Log Message: ----------- End of support for 4.2.x Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 67d5a8e30e33c66111ad11ed14267666ccee2ad5 https://github.com/phpmyadmin/website/commit/67d5a8e30e33c66111ad11ed142676… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-01 (Wed, 01 Jul 2015) Changed paths: M templates/phpmyadmin-doap.xml.tpl Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/website Commit: d24d31bcbd3f70c918f2dccf52d1e15be7e0ae9b https://github.com/phpmyadmin/website/commit/d24d31bcbd3f70c918f2dccf52d1e1… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-07-01 (Wed, 01 Jul 2015) Log Message: ----------- Merge branch 'master' into django Conflicts: render.py Compare: https://github.com/phpmyadmin/website/compare/9577d5acbabb...d24d31bcbd3f