Branch: refs/heads/django
Home: https://github.com/phpmyadmin/website
Commit: fcc900ca38cc082cea4125135f4eb8a99501a40c
https://github.com/phpmyadmin/website/commit/fcc900ca38cc082cea4125135f4eb8a99501a40c
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M templates/phpmyadmin-doap.xml.tpl
Log Message:
-----------
Fix project name
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: f3d45af50e69bea0388eb2e9c133ec2259861e45
https://github.com/phpmyadmin/website/commit/f3d45af50e69bea0388eb2e9c133ec2259861e45
Author: Michal Čihař <mic...@cihar.com>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M pmaweb/templates/phpmyadmin-doap.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into django
Conflicts:
pmaweb/templates/phpmyadmin-doap.xml
Compare:
https://github.com/phpmyadmin/website/compare/7e59241c6778...f3d45af50e69
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git