diff options
| author | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 00:52:24 +0100 |
|---|---|---|
| committer | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 00:52:24 +0100 |
| commit | 2363246eeaa700924279ba288a18b518d570b9ca (patch) | |
| tree | e823504a8991a1cfce4326c0c6b906d7f87058ef /docs | |
| parent | 65deaaacf507c9e1d01773887d8c56be847ff1bd (diff) | |
| parent | dc4d3d8cbee6659ac444cb4696edd9bd8157f6eb (diff) | |
Merge remote-tracking branch 'stagrlee/master' into autotools
Conflicts:
Makefile
jq_test.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Rakefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/Rakefile b/docs/Rakefile index 2d7b2fe8..0caaeca8 100644 --- a/docs/Rakefile +++ b/docs/Rakefile @@ -1,3 +1,4 @@ +require 'yaml' require 'bonsai' require 'liquid' require 'maruku' |