diff options
| author | davidtsadler <davidtsadler@googlemail.com> | 2012-09-12 21:14:23 +0100 |
|---|---|---|
| committer | davidtsadler <davidtsadler@googlemail.com> | 2012-09-12 21:14:23 +0100 |
| commit | 4972068ab2e97a017e28f4e7b91858f9fcaeceb6 (patch) | |
| tree | 08bea05f8ea80d416328f105740d6f35c7e24df5 | |
| parent | d4a518c703a9231cd6f5139b99e1035182467e4b (diff) | |
| parent | 9f8866dfed8deebd091cdeb5d9cd9857b3fa107a (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 37e49fd..182b4e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,11 +15,11 @@ GEM kramdown (~> 0.13) liquid (~> 2.3) maruku (~> 0.5) - kramdown (0.13.5) - liquid (2.3.0) + kramdown (0.13.8) + liquid (2.4.1) maruku (0.6.0) syntax (>= 1.0.0) - nokogiri (1.5.2) + nokogiri (1.5.5) posix-spawn (0.3.6) rake (0.9.2.2) rdiscount (1.6.8) |