Merge branch 'master' into detect_plotlib

2016-04-29 18:51:58 +03:00 · 2016-04-29 18:51:58 +03:00 · a760def865
parent 699f5b46e7 9caf014c07
commit a760def865
1 changed files with 1 additions and 1 deletions
--- a/src/pandoc.jl
+++ b/src/pandoc.jl
@ -11,7 +11,7 @@ function pandoc2html(formatted::AbstractString, doc::WeaveDoc, outname::Abstract

  path, wsource = splitdir(abspath(doc.source))
  wversion = string(Pkg.installed("Weave"))
-  wtime =  Date(now())
+  wtime =  string(Date(now()))

  #Change path for pandoc
  old_wd = pwd()