Merge pull request #69 from jh3y/develop

Resolve security vulnerability by updating "marked" dependency
jh3y · Jan 4, 2018 · ba42f1f · ba42f1f
2 parents 6e07434 + 4aaa69d
commit ba42f1f
Show file tree

Hide file tree

Showing 5 changed files with 4,033 additions and 1,959 deletions.
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@
 tyto - http://jh3y.github.io/tyto
 Licensed under the MIT license
 
-jh3y (c) 2017
+jh3y (c) 2018
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/LOG.md b/LOG.md
@@ -12,3 +12,4 @@ Log  ![alt tag](https://raw.github.com/jh3y/tyto/master/src/img/tyto.png)
 * __06/12/16__: V3.0.1 Removal of Bower in favor of just npm use with Yarn. Fix issues #60 and #61
 * __17/07/2017__: V3.0.2 Update `yarn.lock` and deps to use `jquery/jquery-ui`. Update vendor scripts required. Add `package-lock.json`
 * __11/10/2017__: V3.0.3 Update `mocha-phantomjs` and add styling rules for embedded images #67
+* __04/01/2018__: V3.0.4 Update `marked` dependency as triggering security warning from Github