Commit 780894b6 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge branch 'master' into doc-tags

parents 588d31d0 e308ba4c

.travis.yml

+2 −1
Original line number Diff line number Diff line 
language: ruby

rvm:

  - "1.8.7"

  - "1.9.2"

  - "1.9.3"

install:

  - gem install rdiscount

  - gem install json
@@ -9,3 +9,4 @@ install: 
  - gem install therubyracer -v 0.10.1

  - gem install rspec

  - gem install rake

  - gem install dimensions