Version 1.0.5 with 2 new checks: CVE-2014-2322 and CVE-2014-0036

thesp0nge · Mar 18, 2014 · 32a8677 · 32a8677
1 parent 826fa38
commit 32a8677
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -3,15 +3,14 @@
 Codesake::Dawn is a static analysis security scanner for ruby written web applications.
 It supports [Sinatra](http://www.sinatrarb.com),
 [Padrino](http://www.padrinorb.com) and [Ruby on Rails](http://rubyonrails.org)
-frameworks. 
+frameworks.
 
-_latest update: Fri Jan 24 07:57:58 CET 2014_
+_latest update: Tue Mar 18 15:57:42 CET 2014_
+
+## Version 1.0.5 - codename: Lightning McQueen (2014-03-18)
 
-<<<<<<< HEAD
 * Added a check for CVE-2014-2322
-=======
 * Added a check for CVE-2014-0036
->>>>>>> issue_43_cve_2014_0036
 
 ## Version 1.0.4 - codename: Lightning McQueen (2014-03-14)
 

diff --git a/lib/codesake/dawn/version.rb b/lib/codesake/dawn/version.rb
@@ -16,10 +16,10 @@ module Dawn
     # "Guido"
     # "Luigi"
 
-    VERSION   = "1.0.4"
+    VERSION   = "1.0.5"
     CODENAME  = "Lightning McQueen"
     # RELEASE   = "(development)"
-    RELEASE   = "20140314"
+    RELEASE   = "20140318"
 
   end
 end