Solve Git Merge conflict

This commit is contained in:
Peter
2014-05-09 08:13:33 +02:00

View File

@@ -12544,12 +12544,23 @@
<plugin name="photo-gallery">
<vulnerability>
<title>WordPress Photo-Gallery Cross Site Request Forgery</title>
<title>Photo-Gallery - Cross Site Request Forgery</title>
<references>
<url>http://packetstormsecurity.com/files/126521/wpphotogallery-xsrf.txt</url>
<url>http://packetstormsecurity.com/files/126521/</url>
</references>
<type>CSRF</type>
</vulnerability>
</plugin>
<plugin name="infusion4wp">
<vulnerability>
<title>iMember360is 3.9.001 - XSS / Disclosure / Code Execution</title>
<references>
<url>http://1337day.com/exploit/22184</url>
</references>
<type>MULTI</type>
<fixed_in>3.9.002</fixed_in>
</vulnerability>
</plugin>
</vulnerabilities>